Skip to content

Commit d23d7b8

Browse files
authored
Merge pull request #3083 from bnbarham/cherry-workflow-updates
[6.2] GitHub action updates
2 parents db9f1e5 + ad97d18 commit d23d7b8

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

.github/workflows/publish_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- run: |
27-
if [[ "${{ github.triggering_actor }}" != "ahoppen" ]]; then
27+
if [[ "${{ github.triggering_actor }}" != "bnbarham" ]]; then
2828
echo "${{ github.triggering_actor }} is not allowed to create a release"
2929
exit 1
3030
fi

.github/workflows/pull_request.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: Pull request
22

3+
# PRs created by GitHub Actions don't kick off further actions (https://github.com/peter-evans/create-pull-request/blob/d57e551ebc1a16dee0b8c9ea6d24dba7627a6e35/docs/concepts-guidelines.md#triggering-further-workflow-runs).
4+
# As a workaround, we mark automerge PRs that are created by GitHub actions as draft and trigger the GitHub actions by marking the PR as ready for review. We'd prefer not re-triggering testing on a normal user's PR in this case, but skipping them causes the checks to reset.
35
on:
46
pull_request:
57
types: [opened, reopened, synchronize, ready_for_review]
@@ -11,20 +13,15 @@ concurrency:
1113
jobs:
1214
tests:
1315
name: Test
14-
# PRs created by GitHub Actions don't kick off further actions (https://github.com/peter-evans/create-pull-request/blob/d57e551ebc1a16dee0b8c9ea6d24dba7627a6e35/docs/concepts-guidelines.md#triggering-further-workflow-runs).
15-
# As a workaround, we mark automerge PRs that are created by GitHub actions as draft and trigger the GitHub actions by marking the PR as ready for review. But we don't want to re-trigger testing this when a normal user's PR is marked as ready for review.
16-
if: (github.event.action != 'ready_for_review') || (github.event.action == 'ready_for_review' && github.event.pull_request.user.login == 'github-actions[bot]')
1716
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
1817
soundness:
1918
name: Soundness
20-
if: (github.event.action != 'ready_for_review') || (github.event.action == 'ready_for_review' && github.event.pull_request.user.login == 'github-actions[bot]')
2119
uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
2220
with:
2321
api_breakage_check_enabled: false # https://github.com/swiftlang/swift-syntax/issues/3010
2422
docs_check_additional_arguments: "--disable-parameters-and-returns-validation"
2523
verify_source_code:
2624
name: Validate generated code
27-
if: (github.event.action != 'ready_for_review') || (github.event.action == 'ready_for_review' && github.event.pull_request.user.login == 'github-actions[bot]')
2825
runs-on: ubuntu-latest
2926
container:
3027
image: swift:latest
@@ -37,7 +34,6 @@ jobs:
3734
run: "./swift-syntax-dev-utils verify-source-code --toolchain /usr"
3835
test_using_swift_syntax_dev_utils_linux:
3936
name: Run tests using swift-syntax-dev-utils (Linux)
40-
if: (github.event.action != 'ready_for_review') || (github.event.action == 'ready_for_review' && github.event.pull_request.user.login == 'github-actions[bot]')
4137
runs-on: ubuntu-latest
4238
container:
4339
image: swift:latest
@@ -50,7 +46,6 @@ jobs:
5046
run: "./swift-syntax-dev-utils test --enable-rawsyntax-validation --enable-test-fuzzing --toolchain /usr"
5147
test_using_swift_syntax_dev_utils_windows:
5248
name: Run tests using swift-syntax-dev-utils (Windows)
53-
if: (github.event.action != 'ready_for_review') || (github.event.action == 'ready_for_review' && github.event.pull_request.user.login == 'github-actions[bot]')
5449
runs-on: windows-2022
5550
steps:
5651
- name: Pull Docker image

0 commit comments

Comments
 (0)