From cf790181e0c7f2f132700204dd086dee3ca05c87 Mon Sep 17 00:00:00 2001 From: Lan Liang Date: Sat, 30 Mar 2024 04:10:20 +0000 Subject: [PATCH 1/2] chore: update actions upload-artifact & download-artifact to v4. Signed-off-by: Lan Liang --- .github/workflows/e2e.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index b7f6ec2f5..e2a8b0f65 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -40,12 +40,12 @@ jobs: make docker-build/proxy-server-amd64 REGISTRY=gcr.io/k8s-staging-kas-network-proxy TAG=local BASEIMAGE=${{ env.BASEIMAGE }} docker save gcr.io/k8s-staging-kas-network-proxy/proxy-server-amd64:local > _output/konnectivity-server.tar - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: konnectivity-server path: _output/konnectivity-server.tar - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: konnectivity-agent path: _output/konnectivity-agent.tar @@ -140,11 +140,11 @@ jobs: # dump the kubeconfig for later /usr/local/bin/kind get kubeconfig --name ${{ env.KIND_CLUSTER_NAME}} > _artifacts/kubeconfig.conf - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4 with: name: konnectivity-server - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4 with: name: konnectivity-agent @@ -220,7 +220,7 @@ jobs: - name: Upload Junit Reports if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: kind-junit-${{ env.JOB_NAME }}-${{ github.run_id }} path: './_artifacts/*.xml' @@ -232,7 +232,7 @@ jobs: - name: Upload logs if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: kind-logs-${{ env.JOB_NAME }}-${{ github.run_id }} path: ./_artifacts/logs From 880230ff4362fd49626594ea74a5043823e70a75 Mon Sep 17 00:00:00 2001 From: Lan Liang Date: Sun, 31 Mar 2024 05:23:58 +0000 Subject: [PATCH 2/2] chore: fix github workflow artifact for martix k8s version. Signed-off-by: Lan Liang --- .github/workflows/e2e.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index e2a8b0f65..a35b8c1d1 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -222,7 +222,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: kind-junit-${{ env.JOB_NAME }}-${{ github.run_id }} + name: kind-junit-${{ env.JOB_NAME }}-${{ matrix.k8s }}-${{ matrix.ipFamily }}-${{ github.run_id }} path: './_artifacts/*.xml' - name: Export logs @@ -234,5 +234,5 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: kind-logs-${{ env.JOB_NAME }}-${{ github.run_id }} + name: kind-logs-${{ env.JOB_NAME }}-${{ matrix.k8s }}-${{ matrix.ipFamily }}-${{ github.run_id }} path: ./_artifacts/logs