Skip to content

Commit 5e99a43

Browse files
committed
ci: upgraded gh-actions to v1.2.0 (onboards ci-jobs/wait-pending-jobs
action). fix(contributors): removed auto merge from this workflow, since it competes with auto-merge once the PR is approved. Signed-off-by: Frederic BIDON <fredbi@yahoo.com>
1 parent 271a298 commit 5e99a43

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

.github/workflows/auto-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
run: gh pr review --approve "$PR_URL"
6464
-
6565
name: Wait for all workflow runs to complete
66-
uses: go-openapi/gh-actions/ci-jobs/wait-pending-jobs@55bd46a7224dc61a7b8e64df6d3755b1cf986fba # v1.1.0
66+
uses: go-openapi/gh-actions/ci-jobs/wait-pending-jobs@55bd46a7224dc61a7b8e64df6d3755b1cf986fba # v1.2.0
6767
with:
6868
pr-url: ${{ env.PR_URL }}
6969
github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/bump-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
fetch-depth: 0
5959
-
6060
name: install svu
61-
uses: go-openapi/gh-actions/install/svu@3983df5e4a081b07ed17723b86610d306f40021e # v1.0.0
61+
uses: go-openapi/gh-actions/install/svu@55bd46a7224dc61a7b8e64df6d3755b1cf986fba # v1.2.0
6262
-
6363
name: Bump release
6464
id: bump-release

.github/workflows/collect-reports.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
path: reports/
3333
-
3434
name: Install go-junit-report
35-
uses: go-openapi/gh-actions/install/go-junit-report@3983df5e4a081b07ed17723b86610d306f40021e # v1.0.0
35+
uses: go-openapi/gh-actions/install/go-junit-report@55bd46a7224dc61a7b8e64df6d3755b1cf986fba # v1.2.0
3636
-
3737
name: Convert test reports to a merged JUnit XML
3838
# NOTE: codecov test reports only support JUnit format at this moment. See https://docs.codecov.com/docs/test-analytics.
@@ -57,7 +57,7 @@ jobs:
5757
verbose: true
5858
-
5959
name: Install go-ctrf-json-reporter
60-
uses: go-openapi/gh-actions/install/go-ctrf-json-reporter@3983df5e4a081b07ed17723b86610d306f40021e # v1.0.0
60+
uses: go-openapi/gh-actions/install/go-ctrf-json-reporter@55bd46a7224dc61a7b8e64df6d3755b1cf986fba # v1.2.0
6161
-
6262
name: Convert test reports to CTRF JSON
6363
# description: |

.github/workflows/contributors.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,14 @@ jobs:
8383
-
8484
name: Auto-approve PR
8585
run: gh pr review --approve "$PR_URL"
86-
-
87-
name: Wait for all workflow runs to complete
88-
uses: go-openapi/gh-actions/ci-jobs/wait-pending-jobs@55bd46a7224dc61a7b8e64df6d3755b1cf986fba # v1.1.0
89-
with:
90-
pr-url: ${{ env.PR_URL }}
91-
github-token: ${{ secrets.GITHUB_TOKEN }}
92-
-
93-
name: Auto-merge PR
94-
run: gh pr merge --auto --rebase "$PR_URL"
86+
# The approval event normally kicks regular workflows, in particular the auto-merge workflow.
87+
# So there is no need to merge here. Explicit merging was initially added because this
88+
#-
89+
# name: Wait for all workflow runs to complete
90+
# uses: go-openapi/gh-actions/ci-jobs/wait-pending-jobs@55bd46a7224dc61a7b8e64df6d3755b1cf986fba # v1.2.0
91+
# with:
92+
# pr-url: ${{ env.PR_URL }}
93+
# github-token: ${{ secrets.GITHUB_TOKEN }}
94+
#-
95+
# name: Auto-merge PR
96+
# run: gh pr merge --auto --rebase "$PR_URL"

.github/workflows/go-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
cache: true
5454
-
5555
name: Install gotestsum
56-
uses: go-openapi/gh-actions/install/gotestsum@3983df5e4a081b07ed17723b86610d306f40021e # v1.0.0
56+
uses: go-openapi/gh-actions/install/gotestsum@55bd46a7224dc61a7b8e64df6d3755b1cf986fba # v1.2.0
5757
-
5858
name: Run unit tests
5959
run: >

0 commit comments

Comments
 (0)