Update SDLBuild.yml

tobozo · Nov 10, 2023 · 5eb8faf · 5eb8faf
1 parent f3a4863
commit 5eb8faf
Showing 1 changed file with 7 additions and 20 deletions.
diff --git a/.github/workflows/SDLBuild.yml b/.github/workflows/SDLBuild.yml
@@ -43,8 +43,8 @@ jobs:
       fail-fast: true
       matrix:
         include:
-#          - { os: windows-latest }
-#          - { os: macos-12   }
+          - { os: windows-latest }
+          - { os: macos-12   }
           - { os: ubuntu-latest  }
 
     steps:
@@ -80,7 +80,6 @@ jobs:
           cmake --build build/release --config Release
 
 
-
       - name: Build LGFX_SDL2 for Linux
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
@@ -93,13 +92,9 @@ jobs:
           cmake ..
           cmake --build .
 
-
       - name: Build LGFX_SDL2/WASM for Linux
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
-          sudo apt update
-          sudo apt-get install libsdl2-dev
-          cp .github/scripts/SDL.cmake ${{ env.PROJECT_DIR }}/CMakeLists.txt
           git clone https://github.com/emscripten-core/emsdk.git
           cd emsdk
           ./emsdk install latest # any specific version?
@@ -111,25 +106,16 @@ jobs:
           cd build
           emcmake cmake ..
           emmake make
-          mkdir www
-          cp index.html www/index.html
-          cd ..
+          mkdir -p www/WASM
+          cp index.html www/WASM/index.html
 
-      - name: Upload artifact
+      - name: Upload WASM artifact
+        if: ${{ matrix.os == 'ubuntu-latest' }}
         uses: actions/upload-pages-artifact@v2
         with:
           path: ${{env.WASM_DIR}}/build/www
 
 
-
-
-#      - name: Deploy 🚀
-#        if: ${{ matrix.os == 'ubuntu-latest' }}
-#        uses: JamesIves/github-pages-deploy-action@v4
-#        with:
-#          folder: ${{env.WASM_DIR}}/build/www # The folder the action should deploy.
-
-
       - name: Build LGFX_SDL2 for Mac
         if: ${{ matrix.os == 'macos-12' }}
         run: |
@@ -143,6 +129,7 @@ jobs:
 
 
   deploy:
+    name: Deploy WASM Example 🚀
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}