attempt #2 for M1 Mac build: correct targets edition

Strum355 · Jan 2, 2022 · 5fd02b0 · 5fd02b0
1 parent 65422c8
commit 5fd02b0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,15 +34,19 @@ jobs:
         platforms:
         - os: ubuntu-18.04
           target: x86_64-unknown-linux-gnu
+          artifact: x86_64-unknown-linux-gnu
           dir: server/mcshader-lsp
         - os: windows-latest
-          target: x86_64-windows-msvc.exe
+          target: x86_64-pc-windows-msvc
+          artifact: x86_64-windows-msvc.exe
           dir: server/mcshader-lsp.exe
         - os: macos-11
           target: x86_64-apple-darwin
+          artifact: x86_64-apple-darwin
           dir: server/mcshader-lsp
         - os: macos-11
           target: aarch64-apple-darwin
+          artifact: aarch64-apple-darwin
           dir: server/mcshader-lsp
     steps:
     - uses: actions/checkout@v2
@@ -60,7 +64,7 @@ jobs:
       with:
         upload_url: ${{ needs.empty-release.outputs.upload_url }}
         asset_path: ${{ matrix.platforms.dir }}
-        asset_name: mcshader-lsp-${{ matrix.platforms.target }}
+        asset_name: mcshader-lsp-${{ matrix.platforms.artifact }}
         asset_content_type: application/octet-stream
   release-vscode-extension:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -18,26 +18,26 @@ jobs:
         - os: ubuntu-18.04
           target: x86_64-unknown-linux-gnu
           dir: server/mcshader-lsp
-          artifact: x86_64-linux-mcshader-lsp
+          artifact: x86_64-unknown-linux-gnu
         - os: windows-latest
-          target: x86_64-windows-msvc.exe
+          target: x86_64-pc-windows-msvc
           dir: server/mcshader-lsp.exe
-          artifact: x86_64-windows-mcshader-lsp.exe
+          artifact: x86_64-windows-msvc.exe
         - os: macos-11
           target: x86_64-apple-darwin
           dir: server/mcshader-lsp
-          artifact: x86_64-darwin-mcshader-lsp
+          artifact: x86_64-apple-darwin
         - os: macos-11
           target: aarch64-apple-darwin
           dir: server/mcshader-lsp
-          artifact: aarch64-darwin-mcshader-lsp
+          artifact: aarch64-apple-darwin
     steps:
     - uses: actions/checkout@v2
     - name: Build server
       run: cargo build --target ${{ matrix.platforms.target }}
     - uses: actions/upload-artifact@v2
       with:
-        name: ${{ matrix.platforms.artifact }}
+        name: mcshader-lsp-${{ matrix.platforms.artifact }}
         path: ${{ matrix.platforms.dir }}
     - name: Run tests
       run: cargo test --target ${{ matrix.platforms.target }}