From e3d98cf17c279b36d889b08e8c5ceddbeb462b24 Mon Sep 17 00:00:00 2001
From: phlax <phlax@users.noreply.github.com>
Date: Tue, 16 Jan 2024 15:45:24 +0000
Subject: [PATCH] release/ci: Fix artefact publishing (#31837)

Signed-off-by: Ryan Northey <ryan@synca.io>
---
 .azure-pipelines/ci.yml          | 9 ++++++++-
 .azure-pipelines/stage/linux.yml | 1 +
 .github/config.yml               | 2 ++
 .github/workflows/_run.yml       | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml
index 1d959856d503..47b02de10bf7 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')
diff --git a/.azure-pipelines/stage/linux.yml b/.azure-pipelines/stage/linux.yml
index 5c3caa11d3ab..42b2c446dc84 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 72bbcbda8c40..53106eabde8b 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 26d381314cb2..f76457f47731 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 }}