From fcd05b5e1c878c2a5d2b1cae0326336187b7f2cb Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 17 Sep 2023 21:45:36 +0200 Subject: [PATCH] Revert "ci: add shorter labels for target OS names again" This reverts commit f898116209a51e005a9722f7a3825452f6731a13. Let's keep the full target names to stay compatible with cargo-binstall (and possibly cargo-dist in the future). --- .github/workflows/MinedMap.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml index b577b5e..98856ca 100644 --- a/.github/workflows/MinedMap.yml +++ b/.github/workflows/MinedMap.yml @@ -92,21 +92,16 @@ jobs: matrix: include: - os: 'macos-11' - label: 'MacOS-Intel' target: 'aarch64-apple-darwin' - os: 'macos-11' - label: 'MacOS-ARM' target: 'x86_64-apple-darwin' - os: 'windows-2019' - label: 'Win64' target: 'x86_64-pc-windows-msvc' ext: '.exe' - os: 'windows-2019' - label: 'Win32' target: 'i686-pc-windows-msvc' ext: '.exe' - os: 'ubuntu-20.04' - label: 'x86_64-unknown-linux-gnu' target: 'x86_64-unknown-linux-gnu' steps: @@ -131,7 +126,7 @@ jobs: - name: 'Build' shell: 'bash' run: | - pkgdir='target/pkg/MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.label }}' + pkgdir='target/pkg/MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.target }}' mkdir -p "$pkgdir" cargo build --release --target=${{ matrix.target }} cp target/${{ matrix.target }}/release/minedmap${{ matrix.ext }} "$pkgdir"/ @@ -139,5 +134,5 @@ jobs: - name: 'Archive' uses: 'actions/upload-artifact@v3' with: - name: 'MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.label }}' + name: 'MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.target }}' path: 'target/pkg'