Revert "ci: add shorter labels for target OS names again"

This reverts commit f898116209.

Let's keep the full target names to stay compatible with cargo-binstall
(and possibly cargo-dist in the future).
This commit is contained in:
Matthias Schiffer 2023-09-17 21:45:36 +02:00
parent f898116209
commit fcd05b5e1c
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C

View file

@ -92,21 +92,16 @@ jobs:
matrix: matrix:
include: include:
- os: 'macos-11' - os: 'macos-11'
label: 'MacOS-Intel'
target: 'aarch64-apple-darwin' target: 'aarch64-apple-darwin'
- os: 'macos-11' - os: 'macos-11'
label: 'MacOS-ARM'
target: 'x86_64-apple-darwin' target: 'x86_64-apple-darwin'
- os: 'windows-2019' - os: 'windows-2019'
label: 'Win64'
target: 'x86_64-pc-windows-msvc' target: 'x86_64-pc-windows-msvc'
ext: '.exe' ext: '.exe'
- os: 'windows-2019' - os: 'windows-2019'
label: 'Win32'
target: 'i686-pc-windows-msvc' target: 'i686-pc-windows-msvc'
ext: '.exe' ext: '.exe'
- os: 'ubuntu-20.04' - os: 'ubuntu-20.04'
label: 'x86_64-unknown-linux-gnu'
target: 'x86_64-unknown-linux-gnu' target: 'x86_64-unknown-linux-gnu'
steps: steps:
@ -131,7 +126,7 @@ jobs:
- name: 'Build' - name: 'Build'
shell: 'bash' shell: 'bash'
run: | run: |
pkgdir='target/pkg/MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.label }}' pkgdir='target/pkg/MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.target }}'
mkdir -p "$pkgdir" mkdir -p "$pkgdir"
cargo build --release --target=${{ matrix.target }} cargo build --release --target=${{ matrix.target }}
cp target/${{ matrix.target }}/release/minedmap${{ matrix.ext }} "$pkgdir"/ cp target/${{ matrix.target }}/release/minedmap${{ matrix.ext }} "$pkgdir"/
@ -139,5 +134,5 @@ jobs:
- name: 'Archive' - name: 'Archive'
uses: 'actions/upload-artifact@v3' uses: 'actions/upload-artifact@v3'
with: with:
name: 'MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.label }}' name: 'MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.target }}'
path: 'target/pkg' path: 'target/pkg'