Skip to content

Commit 9301781

Browse files
Merge release/8.2 into 8.2.2 (bot)
2 parents 274af94 + 957a89e commit 9301781

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

.github/workflows/pre-merge.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ on:
1111
description: 'Release tag to build'
1212
required: true
1313
type: string
14+
publish_image:
15+
description: 'Publish Docker image to GHCR'
16+
required: false
17+
type: boolean
18+
default: false
1419
outputs:
1520
docker_image_urls:
1621
description: 'Array of Docker image URLs that were published'
@@ -60,7 +65,7 @@ jobs:
6065
platform: ${{ matrix.platform }}
6166
registry_username: ${{ github.actor }}
6267
registry_password: ${{ secrets.GITHUB_TOKEN }}
63-
publish_image: ${{ vars.PUBLISH_IMAGE }}
68+
publish_image: ${{ inputs.publish_image || vars.PUBLISH_IMAGE }}
6469
registry_repository: ${{ format('ghcr.io/{0}', github.repository) }}
6570
release_tag: ${{ inputs.release_tag }}
6671

.github/workflows/release_build_and_test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ jobs:
5757
secrets: inherit
5858
with:
5959
release_tag: ${{ github.event.inputs.release_tag }}
60+
publish_image: true
6061

6162
merge-back-to-release-branch:
6263
needs: [prepare-release, build-and-test]

0 commit comments

Comments
 (0)