a bit more cleanup in ci

geode-sdk · Jun 21, 2024 · 9971ef6 · 9971ef6
1 parent 73c0449
commit 9971ef6
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,28 +17,28 @@ jobs:
       matrix:
         config:
         - name: "Windows"
-          os: ubuntu-latest
-          out_paths: './target/x86_64-pc-windows-gnu/release/geode.exe'
-          static: 'sudo apt-get install gcc-mingw-w64'
           id: win
+          os: ubuntu-latest
+          executable: 'geode.exe'
+          prebuild: 'sudo apt-get install gcc-mingw-w64-x86-64'
           target: x86_64-pc-windows-gnu
 
         - name: "macOS"
-          os: macos-12
-          out_paths: './target/x86_64-apple-darwin/release/geode'
-          static: 'export OPENSSL_STATIC=1'
           id: mac
+          os: macos-12
+          executable: 'geode'
+          prebuild: 'export OPENSSL_STATIC=1'
           target: x86_64-apple-darwin
 
-        - name: "linux"
+        - name: "Linux"
+          id: linux
           os: ubuntu-latest
-          out_paths: './target/x86_64-unknown-linux-gnu/release/geode'
+          executable: 'geode'
           # some stupid old ubuntu versions cant install libssl3
-          static: 'export OPENSSL_STATIC=1'
-          id: linux
+          prebuild: 'export OPENSSL_STATIC=1'
           target: x86_64-unknown-linux-gnu
 
-    name: ${{ matrix.config.name }}
+    name: Build ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
 
     steps:
@@ -51,18 +51,18 @@ jobs:
 
     - uses: Swatinem/rust-cache@v2
       with:
-        key: ${{ matrix.config.name }}
+        key: ${{ matrix.config.id }}
 
     - name: Build
       run: |
-        ${{ matrix.config.static }}
+        ${{ matrix.config.prebuild }}
         cargo build --release --target ${{ matrix.config.target }}
 
     - name: Move to output folder
       shell: bash
       run: |
         mkdir ./out
-        mv ${{ matrix.config.out_paths }} ./out
+        mv ./target/${{ matrix.config.target }}/release/${{ matrix.config.executable }} ./out
 
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4
@@ -71,7 +71,7 @@ jobs:
         path: ./out/
 
   publish:
-    name: Publish Nightly
+    name: Publish
     runs-on: ubuntu-latest
     needs: build
     if: github.ref == 'refs/heads/main'