Add ImageMagick to some builds.

divVerent · Jan 13, 2025 · 02bcdf3 · 02bcdf3
1 parent cb95736
commit 02bcdf3
Show file tree

Hide file tree

Showing 10 changed files with 436 additions and 645 deletions.
diff --git a/.github/workflows/deploy-wasm.yml b/.github/workflows/deploy-wasm.yml
@@ -1,41 +1,34 @@
 name: Deploy WebAssembly Build
-
-on:
+'on':
   push:
     tags: [v*]
-  workflow_dispatch:
-
+  workflow_dispatch: null
 jobs:
-
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: true
-
-    - name: Install Dependencies
-      run: 'sudo apt-get update && sudo apt-get -y install advancecomp zip'
-
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version: '1.22'
-
-    - name: Build
-      run: 'make BUILDTYPE=release BINARY=aaaaxy-js-wasm.wasm'
-      env:
-        AAAAXY_BUILD_USE_VERSION_FILE: true
-        GOARCH: wasm
-        GOOS: js
-
-    - name: Steal/acquire wasm_exec.js
-      run: 'cp -v "$(go env GOROOT)/misc/wasm/wasm_exec.js" .'
-      env:
-        GOARCH: wasm
-        GOOS: js
-
-    - name: Deploy
-      env:
-        DEPLOY_URL: ${{ secrets.DEPLOY_URL }}
-      run: 'tar cvzf - aaaaxy-js-wasm.wasm aaaaxy.html wasm_exec.js | base64 | curl -X POST -d @- "$DEPLOY_URL"'
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Install Dependencies
+        run: 'sudo apt-get update && sudo apt-get -y install advancecomp zip'
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.22'
+      - name: Build
+        run: 'make BUILDTYPE=release BINARY=aaaaxy-js-wasm.wasm'
+        env:
+          AAAAXY_BUILD_USE_VERSION_FILE: true
+          GOARCH: wasm
+          GOOS: js
+      - name: Steal/acquire wasm_exec.js
+        run: 'cp -v "$(go env GOROOT)/misc/wasm/wasm_exec.js" .'
+        env:
+          GOARCH: wasm
+          GOOS: js
+      - name: Deploy
+        env:
+          DEPLOY_URL: ${{ secrets.DEPLOY_URL }}
+        run: 'tar cvzf - aaaaxy-js-wasm.wasm aaaaxy.html wasm_exec.js | base64 | curl
+          -X POST -d @- "$DEPLOY_URL"'
diff --git a/.github/workflows/go-100percent.yml b/.github/workflows/go-100percent.yml
@@ -1,52 +1,44 @@
 name: 100% Single-Platform Test Run
-
-on:
+'on':
   push:
     branches:
       - main
   schedule:
     - cron: '29 12 * * *'
-  workflow_dispatch:
-
+  workflow_dispatch: null
 jobs:
-
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: true
-
-    - name: Install Dependencies
-      run: 'sudo apt-get update && sudo apt-get -y install libasound2-dev libgl-dev libxcursor-dev libxi-dev libxinerama-dev libxrandr-dev libxxf86vm-dev xvfb'
-
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version: '1.22'
-
-    - name: Build
-      run: 'make'
-      env:
-        AAAAXY_BUILD_USE_VERSION_FILE: true
-
-    - name: Fetch Test Cases
-      env:
-        REGRESSION_TEST_URL: ${{ secrets.REGRESSION_TEST_URL }}
-      run: 'curl -o testcases.zip "$REGRESSION_TEST_URL"/100percent-v14.zip'
-
-    - name: Extract Test Cases
-      run: 'unzip testcases.zip'
-
-    - name: Test
-      # Also logging entity defaults so we can generate objecttypes.xml from that.
-      run: 'xvfb-run sh scripts/regression-test-demo.sh linux-amd64 "your time: 1:04:11\\.250; your speedrun categories: 100%, All Notes and All Paths; try next: All Secrets\\." "./aaaaxy -debug_log_entity_defaults" *.dem'
-
-    - name: Archive Results
-      if: ${{ always() }}
-      uses: actions/upload-artifact@v4
-      with:
-        name: regression-test-results-100percent-linux-amd64
-        path: |
-          *.dem.*.log
-          *.dem.*.png
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Install Dependencies
+        run: 'sudo apt-get update && sudo apt-get -y install libasound2-dev libgl-dev
+          libxcursor-dev libxi-dev libxinerama-dev libxrandr-dev libxxf86vm-dev xvfb'
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.22'
+      - name: Build
+        run: 'make'
+        env:
+          AAAAXY_BUILD_USE_VERSION_FILE: true
+      - name: Fetch Test Cases
+        env:
+          REGRESSION_TEST_URL: ${{ secrets.REGRESSION_TEST_URL }}
+        run: 'curl -o testcases.zip "$REGRESSION_TEST_URL"/100percent-v14.zip'
+      - name: Extract Test Cases
+        run: 'unzip testcases.zip'
+      - name: Test
+        run: 'xvfb-run sh scripts/regression-test-demo.sh linux-amd64 "your time:
+          1:04:11\\.250; your speedrun categories: 100%, All Notes and All Paths;
+          try next: All Secrets\\." "./aaaaxy -debug_log_entity_defaults" *.dem'
+      - name: Archive Results
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: regression-test-results-100percent-linux-amd64
+          path: |
+            *.dem.*.log
+            *.dem.*.png