From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Mon, 22 Aug 2022 01:37:14 +0000 (-0700)
Subject: Added cmake and configure matrix runs for Emscripten.
X-Git-Tag: 2.1.0-beta1~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e228ee6f96208a6eea7eb4485d8370c1d06ce292;p=thirdparty%2Fzlib-ng.git

Added cmake and configure matrix runs for Emscripten.
---

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index d6347079d..038d8b3b8 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -348,6 +348,11 @@ jobs:
             packages:  ninja-build llvm-11-tools
             gcov-exec: llvm-cov-11 gcov
 
+          - name: Ubuntu Emscripten WASM32
+            os: ubuntu-latest
+            chost: wasm32
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=${EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCMAKE_C_COMPILER_TARGET=wasm32 -DCMAKE_CROSSCOMPILING_EMULATOR=${EMSDK_NODE} -DZLIB_COMPAT=ON
+
           - name: Windows MSVC 2022 v143 Win32
             os: windows-latest
             compiler: cl
@@ -473,6 +478,10 @@ jobs:
       env:
         HOMEBREW_NO_INSTALL_CLEANUP: 1
 
+    - name: Install Emscripten
+      if: contains(matrix.name, 'WASM32')
+      uses: mymindstorm/setup-emsdk@v11
+
     - name: Initialize Wine
       # Prevent parallel test jobs from initializing Wine at the same time
       if: contains(matrix.packages, 'wine')
diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml
index babdbe617..fb29baf33 100644
--- a/.github/workflows/configure.yml
+++ b/.github/workflows/configure.yml
@@ -160,6 +160,14 @@ jobs:
             compiler: gcc
             configure-args: --warn --zlib-compat --static --with-dfltcc-deflate --with-dfltcc-inflate
 
+          - name: Ubuntu Emscripten WASM32
+            os: ubuntu-latest
+            chost: wasm32
+            configure-args: --warn --zlib-compat --static
+            configure-prefix: emconfigure
+            cflags: -static
+            ldflags: -static
+
           - name: macOS GCC Symbol Prefix
             os: macOS-latest
             compiler: gcc-9
@@ -185,11 +193,15 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y ${{ matrix.packages }}
 
+    - name: Install Emscripten
+      if: contains(matrix.name, 'WASM32')
+      uses: mymindstorm/setup-emsdk@v11
+
     - name: Generate project files
       run: |
         mkdir ${{ matrix.build-dir || '.not-used' }}
         cd ${{ matrix.build-dir || '.' }}
-        ${{ matrix.build-src-dir || '.' }}/configure ${{ matrix.configure-args }}
+        ${{ matrix.configure-prefix }} ${{ matrix.build-src-dir || '.' }}/configure ${{ matrix.configure-args }}
       env:
         CC: ${{ matrix.compiler }}
         CFLAGS: ${{ matrix.cflags }}