From 5f3f7736aa18b623a15a64faca7f4d2361fdd57b Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Thu, 11 Jan 2024 15:43:31 +0000 Subject: [PATCH 1/3] release/ci: Fix artefact publishing Signed-off-by: Ryan Northey --- .azure-pipelines/ci.yml | 11 +++++++++-- .azure-pipelines/stage/linux.yml | 1 + .github/config.yml | 2 ++ .github/workflows/_run.yml | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml index 1d959856d503c..00b5d2a7567eb 100644 --- a/.azure-pipelines/ci.yml +++ b/.azure-pipelines/ci.yml @@ -3,6 +3,10 @@ parameters: displayName: "CI target" type: string default: release +- name: artifactName + displayName: "Artifact name" + type: string + default: "" - name: artifactSuffix displayName: "Suffix of artifact" type: string @@ -339,6 +343,9 @@ steps: - task: PublishBuildArtifacts@1 inputs: pathtoPublish: "$(Build.StagingDirectory)/envoy" - artifactName: ${{ parameters.ciTarget }} + ${{ if eq(parameters.artifactName, '') }}: + artifactName: ${{ parameters.ciTarget }} + ${{ if ne(parameters.artifactName, '') }}: + artifactName: ${{ parameters.artifactName }} timeoutInMinutes: 10 - condition: eq(${{ parameters.publishEnvoy }}, 'true') + condition: and(eq(${{ parameters.publishEnvoy }}, 'true'), ne('${{ parameters.ciTarget }}', 'release.server_only')) diff --git a/.azure-pipelines/stage/linux.yml b/.azure-pipelines/stage/linux.yml index 5c3caa11d3aba..42b2c446dc845 100644 --- a/.azure-pipelines/stage/linux.yml +++ b/.azure-pipelines/stage/linux.yml @@ -63,6 +63,7 @@ jobs: name: target - template: ../ci.yml parameters: + artifactName: release managedAgent: ${{ parameters.managedAgent }} ciTarget: $(target.value) cacheName: "release" diff --git a/.github/config.yml b/.github/config.yml index 72bbcbda8c409..53106eabde8b4 100644 --- a/.github/config.yml +++ b/.github/config.yml @@ -342,6 +342,7 @@ run: - examples/**/* - source/**/* - tools/**/* + - VERSION.txt verify: paths: - .bazelrc @@ -355,6 +356,7 @@ run: - examples/**/* - source/**/* - tools/**/* + - VERSION.txt push: paths tables: diff --git a/.github/workflows/_run.yml b/.github/workflows/_run.yml index 26d381314cb27..f76457f477313 100644 --- a/.github/workflows/_run.yml +++ b/.github/workflows/_run.yml @@ -253,7 +253,7 @@ jobs: warning-match: ${{ inputs.warning-match }} working-directory: ${{ inputs.working-directory }} env: - GITHUB_TOKEN: ${{ steps.checkout.outputs.token && steps.checkout.outputs.token || secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ inputs.trusted && steps.appauth.outputs.token || github.token }} ENVOY_DOCKER_BUILD_DIR: ${{ runner.temp }} ENVOY_RBE: ${{ inputs.rbe != 'false' && 1 || '' }} RBE_KEY: ${{ secrets.rbe-key }} From 65b703ec363943af439f698e5357dc7fa08b8db8 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Tue, 16 Jan 2024 14:39:19 +0000 Subject: [PATCH 2/3] .azure-pipelines/ Signed-off-by: Ryan Northey --- .azure-pipelines/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml index 00b5d2a7567eb..a310bc4afa831 100644 --- a/.azure-pipelines/ci.yml +++ b/.azure-pipelines/ci.yml @@ -348,4 +348,4 @@ steps: ${{ if ne(parameters.artifactName, '') }}: artifactName: ${{ parameters.artifactName }} timeoutInMinutes: 10 - condition: and(eq(${{ parameters.publishEnvoy }}, 'true'), ne('${{ parameters.ciTarget }}', 'release.server_only')) + condition: and(eq(${{ parameters.publishEnvoy }}, 'true')) From 6501b7b29fbe1da9e6df93da0cf998182464aa94 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Tue, 16 Jan 2024 14:40:07 +0000 Subject: [PATCH 3/3] fix condition Signed-off-by: Ryan Northey --- .azure-pipelines/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml index a310bc4afa831..47b02de10bf7c 100644 --- a/.azure-pipelines/ci.yml +++ b/.azure-pipelines/ci.yml @@ -348,4 +348,4 @@ steps: ${{ if ne(parameters.artifactName, '') }}: artifactName: ${{ parameters.artifactName }} timeoutInMinutes: 10 - condition: and(eq(${{ parameters.publishEnvoy }}, 'true')) + condition: eq(${{ parameters.publishEnvoy }}, 'true')