Fix the names of artifacts to no longer use matrix.arch

lockdown-systems · Dec 5, 2024 · ae7a940 · ae7a940
1 parent b7e3cea
commit ae7a940
Showing 1 changed file with 20 additions and 30 deletions.
diff --git a/.github/workflows/linux-release.yml b/.github/workflows/linux-release.yml
@@ -24,11 +24,6 @@ jobs:
             exit 1
           fi
 
-      - name: Display platform and architecture
-        run: |
-          echo "Platform: ${{ runner.os }}, Architecture: ${{ matrix.arch }}"
-          uname -a
-
       - name: Install Linux dependencies
         run: sudo apt-get install -y build-essential fakeroot curl rpm zip sudo
 
@@ -41,9 +36,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ matrix.arch }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-x64
           restore-keys: |
-            ${{ runner.os }}-node-${{ matrix.arch }}-
+            ${{ runner.os }}-node-x64
 
       - name: Install dependencies
         run: npm ci
@@ -52,7 +47,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ matrix.arch }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-x64
 
       - name: Make release
         run: |
@@ -63,28 +58,28 @@ jobs:
           else
             export CYD_ENV=prod
           fi
-          npx electron-forge make --arch ${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}
+          npx electron-forge make --arch x64
 
       - name: Display output files
         run: find out
 
       - name: Upload DEB artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: deb-packages-${{ matrix.arch }}
-          path: out/make/deb/${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}/cyd_*.deb
+          name: deb-packages-x64
+          path: out/make/deb/x64/cyd_*.deb
 
       - name: Upload RPM artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: rpm-packages-${{ matrix.arch }}
-          path: out/make/rpm/${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}/cyd-*.rpm
+          name: rpm-packages-x64
+          path: out/make/rpm/x64/cyd-*.rpm
 
       - name: Upload ZIP artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: zip-packages-${{ matrix.arch }}
-          path: out/make/zip/linux/${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}/Cyd-*.zip
+          name: zip-packages-x64
+          path: out/make/zip/linux/x64/Cyd-*.zip
 
   build-arm64:
     # custom arm64 github-hosted runner
@@ -104,11 +99,6 @@ jobs:
             exit 1
           fi
 
-      - name: Display platform and architecture
-        run: |
-          echo "Platform: ${{ runner.os }}, Architecture: ${{ matrix.arch }}"
-          uname -a
-
       - name: Install Linux dependencies
         run: sudo apt-get install -y build-essential fakeroot curl rpm zip sudo
 
@@ -121,9 +111,9 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ matrix.arch }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-arm64
           restore-keys: |
-            ${{ runner.os }}-node-${{ matrix.arch }}-
+            ${{ runner.os }}-node-arm64
 
       - name: Install dependencies
         run: npm ci
@@ -132,7 +122,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-${{ matrix.arch }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}-arm64
 
       - name: Make release
         run: |
@@ -143,25 +133,25 @@ jobs:
           else
             export CYD_ENV=prod
           fi
-          npx electron-forge make --arch ${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}
+          npx electron-forge make --arch arm64
 
       - name: Display output files
         run: find out
 
       - name: Upload DEB artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: deb-packages-${{ matrix.arch }}
-          path: out/make/deb/${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}/cyd_*.deb
+          name: deb-packages-arm64
+          path: out/make/deb/arm64/cyd_*.deb
 
       - name: Upload RPM artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: rpm-packages-${{ matrix.arch }}
-          path: out/make/rpm/${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}/cyd-*.rpm
+          name: rpm-packages-arm64
+          path: out/make/rpm/arm64/cyd-*.rpm
 
       - name: Upload ZIP artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: zip-packages-${{ matrix.arch }}
-          path: out/make/zip/linux/${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}/Cyd-*.zip
+          name: zip-packages-arm64
+          path: out/make/zip/linux/arm64/Cyd-*.zip