Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge envoy[release/v1.28] into envoy-openssl[release/v1.28] #260

Merged
merged 19 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .azure-pipelines/pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ trigger:
include:
- "main"
- "release/v*"
tags:
include:
- "v*"


# PR build config is manually overridden in Azure pipelines UI with different secrets
Expand Down
61 changes: 58 additions & 3 deletions .azure-pipelines/stage/prechecks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ parameters:
- name: authGCP
type: string
default: ""
- name: authGithubWorkflow
type: string
default: ""
- name: authGithubWorkflowAppId
type: string
default: ""
- name: authGithubWorkflowInstallId
type: string
default: ""
- name: authGPGPassphrase
type: string
default: ""
Expand All @@ -34,6 +43,11 @@ parameters:
type: string
default: true

- name: publishGithubRelease
displayName: "Publish Github release"
type: string
default: false

# Timeout/s
- name: timeoutPrechecks
type: number
Expand Down Expand Up @@ -219,10 +233,51 @@ jobs:
# https://learn.microsoft.com/en-us/azure/devops/pipelines/process/expressions?view=azure-devops#job-to-job-dependencies-within-one-stage
condition: |
and(
eq(variables['Build.Reason'], 'PullRequest'),
in(dependencies.prechecks.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
in(dependencies.precheck_release_x64.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
in(dependencies.precheck_release_arm64.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'))
steps:
- checkout: none
- task: DownloadSecureFile@1
name: WorkflowTriggerKey
displayName: 'Download workflow trigger key'
inputs:
secureFile: '${{ parameters.authGithubWorkflow }}'
- bash: |
echo "Prechecked"
set -e
KEY="$(cat $(WorkflowTriggerKey.secureFilePath) | base64 -w0)"
echo "##vso[task.setvariable variable=value;isoutput=true]$KEY"
name: key
- template: ../ci.yml
parameters:
ciTarget: verify.trigger
cacheName: verify-trigger
authGithub: "$(key.value)"
cacheVersion: $(cacheKeyBazel)
publishEnvoy: false
publishTestResults: false
env:
ENVOY_REPO: $(Build.Repository.Name)
${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
ENVOY_HEAD_REF: "$(Build.SourceBranch)"
ENVOY_BRANCH: "$(System.PullRequest.TargetBranch)"
ENVOY_COMMIT: "$(System.PullRequest.SourceCommitId)"
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
ENVOY_HEAD_REF: "$(Build.SourceBranchName)"
ENVOY_BRANCH: "$(Build.SourceBranch)"
# github auth
GITHUB_APP_ID: ${{ parameters.authGithubWorkflowAppId }}
GITHUB_INSTALL_ID: ${{ parameters.authGithubWorkflowInstallId }}
# rbe env
GCS_ARTIFACT_BUCKET: ${{ parameters.bucketGCP }}
stepsPre:
- bash: |
set -e
if [[ "$BUILD_REASON" == "PullRequest" ]]; then
DOWNLOAD_PATH="$(git rev-parse HEAD | head -c7)"
else
DOWNLOAD_PATH="${SYSTEM_PULLREQUEST_PULLREQUESTNUMBER:-${BUILD_SOURCEBRANCHNAME}}"
fi
curl -sLO "https://storage.googleapis.com/${{ parameters.bucketGCP }}/${DOWNLOAD_PATH}/release/release.signed.tar.zst"
mkdir -p $(Build.StagingDirectory)/release.signed
mv release.signed.tar.zst $(Build.StagingDirectory)/release.signed
displayName: Fetch signed release
Loading