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

release/ci: Fix artefact publishing #31837

Merged
merged 3 commits into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
11 changes: 9 additions & 2 deletions .azure-pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just spotted this - which doesnt work but shouldnt be here it was a failed attempt to fix

1 change: 1 addition & 0 deletions .azure-pipelines/stage/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
name: target
- template: ../ci.yml
parameters:
artifactName: release
managedAgent: ${{ parameters.managedAgent }}
ciTarget: $(target.value)
cacheName: "release"
Expand Down
2 changes: 2 additions & 0 deletions .github/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ run:
- examples/**/*
- source/**/*
- tools/**/*
- VERSION.txt
verify:
paths:
- .bazelrc
Expand All @@ -355,6 +356,7 @@ run:
- examples/**/*
- source/**/*
- tools/**/*
- VERSION.txt
push: paths

tables:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down