Skip to content

Commit 2dbdf70

Browse files
authored
[build] Fix vars context not support in composite action files (#3100)
Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com> [skip ci]
1 parent 40ed786 commit 2dbdf70

11 files changed

Lines changed: 24 additions & 11 deletions

.github/actions/get-latest-upstream/action.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,18 @@ inputs:
1010
description: 'GitHub CLI authentication token'
1111
required: true
1212
type: secret
13+
authors:
14+
description: 'GitHub organization or user to fetch Selenium releases from'
15+
required: false
16+
default: 'SeleniumHQ'
1317

1418
runs:
1519
using: "composite"
1620
steps:
1721
- name: Get latest upstream
1822
shell: bash
1923
env:
20-
AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
24+
AUTHORS: ${{ inputs.authors }}
2125
run: |
2226
sudo apt update
2327
sudo apt install jq

.github/workflows/build-ffmpeg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
cat .env | xargs -I {} echo {} >> $GITHUB_ENV
4646
env:
4747
NAMESPACE: ${{ vars.DOCKER_NAMESPACE || 'selenium' }}
48-
AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
48+
AUTHORS: ${{ vars.AUTHORS || github.repository_owner }}
4949
- name: Build images
5050
uses: nick-invision/retry@master
5151
with:

.github/workflows/deploy.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ jobs:
8383
with:
8484
release: ${{ github.event.inputs.stable || true }}
8585
gh_cli_token: ${{ secrets.GITHUB_TOKEN }}
86+
authors: ${{ vars.AUTHORS || github.repository_owner }}
8687
- name: Sets build date
8788
run: |
8889
if [ -z "${BUILD_DATE}" ]; then
@@ -95,7 +96,7 @@ jobs:
9596
cat .env | xargs -I {} echo {} >> $GITHUB_ENV
9697
env:
9798
NAMESPACE: ${{ vars.DOCKER_NAMESPACE || 'selenium' }}
98-
AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
99+
AUTHORS: ${{ vars.AUTHORS || github.repository_owner }}
99100
BUILD_DATE: ${{ github.event.inputs.build-date || '' }}
100101
- name: Sets prerelease to false by default
101102
run: echo "PRERELEASE=false" >> $GITHUB_ENV

.github/workflows/docker-test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,13 @@ jobs:
212212
with:
213213
release: ${{ inputs.release || false }}
214214
gh_cli_token: ${{ secrets.GITHUB_TOKEN }}
215+
authors: ${{ vars.AUTHORS || github.repository_owner }}
215216
- name: Sets build date
216217
run: |
217218
echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
218219
echo "AUTHORS=${AUTHORS}" >> $GITHUB_ENV
219220
env:
220-
AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
221+
AUTHORS: ${{ vars.AUTHORS || github.repository_owner }}
221222
- name: Build Docker images
222223
uses: nick-invision/retry@master
223224
if: matrix.build-all == true

.github/workflows/helm-chart-test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,13 @@ jobs:
181181
with:
182182
release: ${{ inputs.release || false }}
183183
gh_cli_token: ${{ secrets.GITHUB_TOKEN }}
184+
authors: ${{ vars.AUTHORS || github.repository_owner }}
184185
- name: Sets build date
185186
run: |
186187
echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
187188
echo "AUTHORS=${AUTHORS}" >> $GITHUB_ENV
188189
env:
189-
AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
190+
AUTHORS: ${{ vars.AUTHORS || github.repository_owner }}
190191
- name: Build Helm charts
191192
run: |
192193
BUILD_DATE=${BUILD_DATE} make chart_build

.github/workflows/k8s-scaling-test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,13 @@ jobs:
158158
with:
159159
release: ${{ inputs.release || false }}
160160
gh_cli_token: ${{ secrets.GITHUB_TOKEN }}
161+
authors: ${{ vars.AUTHORS || github.repository_owner }}
161162
- name: Sets build date
162163
run: |
163164
echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
164165
echo "AUTHORS=${AUTHORS}" >> $GITHUB_ENV
165166
env:
166-
AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
167+
AUTHORS: ${{ vars.AUTHORS || github.repository_owner }}
167168
- name: Login Docker Hub
168169
run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
169170
env:

.github/workflows/nightly.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jobs:
5656
with:
5757
release: false
5858
gh_cli_token: ${{ secrets.GITHUB_TOKEN }}
59+
authors: ${{ vars.AUTHORS || github.repository_owner }}
5960
- name: Sets build date
6061
run: |
6162
echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
@@ -68,7 +69,7 @@ jobs:
6869
echo "AUTHORS=${AUTHORS}" >> $GITHUB_ENV
6970
env:
7071
NAMESPACE: ${{ vars.DOCKER_NAMESPACE || 'selenium' }}
71-
AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
72+
AUTHORS: ${{ vars.AUTHORS || github.repository_owner }}
7273
- name: Get Grid version
7374
run: |
7475
echo ${BASE_VERSION}

.github/workflows/release-chrome-for-testing-versions.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ env:
4949
REUSE_BASE: ${{ github.event.inputs.reuse-base || true }}
5050
BUILD_DATE: ${{ github.event.inputs.build-date || '' }}
5151
NAMESPACE: ${{ vars.DOCKER_NAMESPACE || 'selenium' }}
52-
AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
52+
AUTHORS: ${{ vars.AUTHORS || github.repository_owner }}
5353
PUSH_IMAGE: ${{ github.event.inputs.push-image || false }}
5454
PR_CHANGELOG: ${{ github.event.inputs.pr-changelog || true }}
5555
RUN_ID: ${{ github.run_id }}
@@ -86,6 +86,7 @@ jobs:
8686
with:
8787
release: ${{ github.event.inputs.stable || true }}
8888
gh_cli_token: ${{ secrets.GITHUB_TOKEN }}
89+
authors: ${{ vars.AUTHORS || github.repository_owner }}
8990
- name: Sets build date
9091
run: |
9192
if [ -z "${BUILD_DATE}" ]; then

.github/workflows/release-chrome-versions.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ env:
4949
REUSE_BASE: ${{ github.event.inputs.reuse-base || true }}
5050
BUILD_DATE: ${{ github.event.inputs.build-date || '' }}
5151
NAMESPACE: ${{ vars.DOCKER_NAMESPACE || 'selenium' }}
52-
AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
52+
AUTHORS: ${{ vars.AUTHORS || github.repository_owner }}
5353
PUSH_IMAGE: ${{ github.event.inputs.push-image || false }}
5454
PR_CHANGELOG: ${{ github.event.inputs.pr-changelog || true }}
5555
RUN_ID: ${{ github.run_id }}
@@ -86,6 +86,7 @@ jobs:
8686
with:
8787
release: ${{ github.event.inputs.stable || true }}
8888
gh_cli_token: ${{ secrets.GITHUB_TOKEN }}
89+
authors: ${{ vars.AUTHORS || github.repository_owner }}
8990
- name: Sets build date
9091
run: |
9192
if [ -z "${BUILD_DATE}" ]; then

.github/workflows/release-edge-versions.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ env:
4949
REUSE_BASE: ${{ github.event.inputs.reuse-base || true }}
5050
BUILD_DATE: ${{ github.event.inputs.build-date || '' }}
5151
NAMESPACE: ${{ vars.DOCKER_NAMESPACE || 'selenium' }}
52-
AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
52+
AUTHORS: ${{ vars.AUTHORS || github.repository_owner }}
5353
PUSH_IMAGE: ${{ github.event.inputs.push-image || false }}
5454
PR_CHANGELOG: ${{ github.event.inputs.pr-changelog || true }}
5555
RUN_ID: ${{ github.run_id }}
@@ -86,6 +86,7 @@ jobs:
8686
with:
8787
release: ${{ github.event.inputs.stable || true }}
8888
gh_cli_token: ${{ secrets.GITHUB_TOKEN }}
89+
authors: ${{ vars.AUTHORS || github.repository_owner }}
8990
- name: Sets build date
9091
run: |
9192
if [ -z "${BUILD_DATE}" ]; then

0 commit comments

Comments
 (0)