From 0fb988b425b13d7c80f511dbc3cc79a365f113e7 Mon Sep 17 00:00:00 2001
From: Johannes Lorenz <j.git@lorenz-ho.me>
Date: Sat, 21 Sep 2024 09:46:41 +0200
Subject: [PATCH] fix all

---
 .github/workflows/run-help.yml | 46 +++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/run-help.yml b/.github/workflows/run-help.yml
index 5a0b801a893..60fc0b62601 100644
--- a/.github/workflows/run-help.yml
+++ b/.github/workflows/run-help.yml
@@ -8,7 +8,7 @@ jobs:
   help-linux:
     name: help-linux
     runs-on: ubuntu-latest
-    container: ghcr.io/lmms/linux.gcc:20.04
+    #container: ghcr.io/lmms/linux.gcc:20.04
     steps:
       - name: wait for build
         uses: lewagon/wait-on-check-action@v1.3.4
@@ -34,29 +34,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [ x86_64, arm64 ]
-    name: help-macos-${{ matrix.arch }}
-    runs-on: ${{ matrix.os }}
-    env:
-      MAKEFLAGS: -j3
-      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
+        config:
+          - arch: 'x86_64'
+            runner: 'macos-latest'
+          - arch: 'arm64'
+            runner: 'macos-latest-arm64'
+    name: help-macos-${{ matrix.config.arch }}
+    runs-on: ${{ matrix.config.runner }}
     steps:
       - name: wait for build
         uses: lewagon/wait-on-check-action@v1.3.4
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
-          check-name: macos-${{ matrix.arch }}
+          check-name: macos-${{ matrix.config.arch }}
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           wait-interval: 30
       - name: Download workflow artifact
         uses: dawidd6/action-download-artifact@v6
         with:
           workflow: build.yml
-          name: macos-${{ matrix.arch }}
+          name: macos-${{ matrix.config.arch }}
       - name: Mount the DMG
         run: |
           mkdir -p /Volumes/lmms
-          hdiutil attach lmms.dmg -mountpoint /Volumes/lmms
+          hdiutil attach lmms-*.dmg -mountpoint /Volumes/lmms
           cp -R "/Volumes/lmms/LMMS.app" /tmp/
       - name: Display help
         run: |
@@ -67,8 +68,7 @@ jobs:
       matrix:
         arch: ['32', '64']
     name: help-mingw${{ matrix.arch }}
-    runs-on: ubuntu-latest
-    container: ghcr.io/lmms/linux.mingw:20.04
+    runs-on: windows-latest
     steps:
       - name: wait for build
         uses: lewagon/wait-on-check-action@v1.3.4
@@ -77,28 +77,38 @@ jobs:
           check-name: mingw${{ matrix.arch }}
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           wait-interval: 30
+      - name: Download workflow artifact
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: build.yml
+          name: mingw${{ matrix.arch }}
       - name: Display help
         run: >
-          WINEPREFIX=/tmp/lmms-wineprefix
-          wine "build/install/lmms.exe" --help |
-          grep "Usage: lmms"
+            $result = & lmms-*.exe "--help" |
+            Select-String "Usage: lmms";
+            if($result.Matches.Count -eq 0) { exit 1 }
   help-msvc:
     strategy:
       fail-fast: false
       matrix:
         arch: ['x86', 'x64']
     name: help-msvc-${{ matrix.arch }}
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
       - name: wait for build
         uses: lewagon/wait-on-check-action@v1.3.4
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
-          check-name: msvc-${{ matrix.arch }}
+          check-name: windows-${{ matrix.arch }}
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           wait-interval: 30
+      - name: Download workflow artifact
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: build.yml
+          name: windows-${{ matrix.arch }}
       - name: Display help
         run: >
-            $result = & "build/install/lmms.exe" "--help" |
+            $result = & lmms-*.exe "--help" |
             Select-String "Usage: lmms";
             if($result.Matches.Count -eq 0) { exit 1 }