From 7f45eb041cf10c82fe960b7ee95f12d761d4fee5 Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Thu, 10 Nov 2022 10:39:47 -0700 Subject: [PATCH 1/2] ci(actions): migrate to file-based commands Signed-off-by: Bjorn Neergaard (cherry picked from commit 05575699471c4ba8e233f62f1005814a9afcb3bb) Signed-off-by: Bjorn Neergaard --- .github/workflows/.windows.yml | 2 +- .github/workflows/test.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/.windows.yml b/.github/workflows/.windows.yml index 05f1eb51ac..deef06e9d1 100644 --- a/.github/workflows/.windows.yml +++ b/.github/workflows/.windows.yml @@ -231,7 +231,7 @@ jobs: # Also prepend ./... to the matrix. This is a special case to run "Test integration" step exclusively. matrix="$(gotestlist -d ${{ env.ITG_CLI_MATRIX_SIZE }} ./...)" matrix="$(echo "$matrix" | jq -c '. |= ["./..."] + .')" - echo "::set-output name=matrix::$matrix" + echo "matrix=$matrix" >> $GITHUB_OUTPUT - name: Show matrix run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 31b94a8a87..adbb99702c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -76,7 +76,7 @@ jobs: id: scripts run: | scripts=$(jq -ncR '[inputs]' <<< "$(ls -I .validate -I all -I default -I dco -I golangci-lint.yml -I yamllint.yaml -A ./hack/validate/)") - echo "::set-output name=matrix::$scripts" + echo "matrix=$scripts" >> $GITHUB_OUTPUT - name: Show matrix run: | @@ -403,7 +403,7 @@ jobs: # Also prepend ./... to the matrix. This is a special case to run "Test integration" step exclusively. matrix="$(gotestlist -d ${{ env.ITG_CLI_MATRIX_SIZE }} ./...)" matrix="$(echo "$matrix" | jq -c '. |= ["./..."] + .')" - echo "::set-output name=matrix::$matrix" + echo "matrix=$matrix" >> $GITHUB_OUTPUT - name: Show matrix run: | From bfca3185ee6dc2dfdb0c4299b8741d2ca989f25b Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Thu, 10 Nov 2022 10:45:25 -0700 Subject: [PATCH 2/2] ci(actions): bump outdated actions on Linux Signed-off-by: Bjorn Neergaard (cherry picked from commit 6a02afa56fd6a529e684d7b7eae21195598958aa) Signed-off-by: Bjorn Neergaard --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de94c7784d..7f2c7821ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,10 +39,10 @@ jobs: fetch-depth: 0 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Build - uses: docker/bake-action@v1 + uses: docker/bake-action@v2 with: targets: ${{ matrix.target }} - @@ -84,17 +84,17 @@ jobs: echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Build - uses: docker/bake-action@v1 + uses: docker/bake-action@v2 with: targets: cross env: DOCKER_CROSSPLATFORMS: ${{ matrix.platform }} - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: cross-${{ env.PLATFORM_PAIR }} path: ${{ env.BUNDLES_OUTPUT }}