From 70e537489ce4903fd6f9b0a87d229625072b3352 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Wed, 31 May 2023 14:06:50 -0400 Subject: [PATCH] debug artifacts Remove Docker image version from release artifact name Docker image version technically matters for the release artifacts themselves, but we already version them with cxx-common version --- .github/workflows/vcpkg_ci_amd64.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/vcpkg_ci_amd64.yml b/.github/workflows/vcpkg_ci_amd64.yml index efed664c..abc44d74 100644 --- a/.github/workflows/vcpkg_ci_amd64.yml +++ b/.github/workflows/vcpkg_ci_amd64.yml @@ -38,8 +38,9 @@ jobs: fail-fast: false matrix: image: - - { name: 'ubuntu-v2', tag: '20.04' } - - { name: 'ubuntu-v2', tag: '22.04' } + # 'name' is Docker image name whereas 'os' is more generic + - { os: 'ubuntu', name: 'ubuntu-v2', tag: '20.04' } + - { os: 'ubuntu', name: 'ubuntu-v2', tag: '22.04' } llvm: [ 'llvm-15', 'llvm-16[pasta]', 'llvm-16' ] target_arch: [ 'x64', 'arm64' ] @@ -49,13 +50,13 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: ${{matrix.image.name}}-${{matrix.image.tag}} ${{matrix.llvm}} ${{matrix.target_arch}} + name: ${{matrix.image.os}}-${{matrix.image.tag}} ${{matrix.llvm}} ${{matrix.target_arch}} runs-on: ubuntu-latest # run the job on the newly created runner steps: - name: Set Artifact Name run: | # Need to fix because paths with brackets cause issues - NAME="$(echo 'vcpkg_${{ matrix.image.name }}-${{ matrix.image.tag }}_${{ matrix.llvm }}_${{ matrix.target_arch == 'x64' && 'amd64' || matrix.target_arch }}' | tr '[' '-' | tr -d ']')" + NAME="$(echo 'vcpkg_${{ matrix.image.os }}-${{ matrix.image.tag }}_${{ matrix.llvm }}_${{ matrix.target_arch == 'x64' && 'amd64' || matrix.target_arch }}' | tr '[' '-' | tr -d ']')" echo "ARTIFACT_NAME=${NAME}" >> "$GITHUB_ENV" - uses: actions/checkout@v3