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.

Sign up for GitHub

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

ci: update 2 GHAs with merge_queue branch filter #4655

Closed
wants to merge 1 commit into from
Closed

ci: update 2 GHAs with merge_queue branch filter #4655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ name: "CodeQL - Python"

on:
push:
branches: [ "main" ]
branches:
- 'main'
- 'gh-readonly-queue/main/*'
paths-ignore:
- '**/tests/integration/*'
pull_request:
Expand All @@ -11,9 +13,6 @@ on:
- '**/tests/integration/*'
schedule:
- cron: "1 18 * * 0"
merge_group:
types: [checks_requested]
branches: [main]
Comment on lines -14 to -16
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you expand on why this change is necessary? Why should this run on push instead of merge_group?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Initially, these checks wouldn't start for #4652, but upon review, they are now triggering as expected. I can't find a github status error explaining why, but this PR does now appear unnecessary.


jobs:
analyze:
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/usage_guide.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- main
- 'gh-readonly-queue/main/*'
pull_request:
branches:
- main
Expand Down Expand Up @@ -39,22 +40,22 @@ jobs:
run: |
cd docs/usage-guide
mdbook build

- name: Deploy documentation to gh-pages
uses: JamesIves/[email protected]
if: github.event_name == 'push'
with:
target-folder: usage-guide
folder: docs/usage-guide/book

- name: Configure AWS credentials
uses: aws-actions/[email protected]
if: github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-west-1

- name: Upload to S3
if: github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name
id: s3
Expand All @@ -63,8 +64,8 @@ jobs:
aws s3 sync docs/usage-guide/book "s3://s2n-tls-ci-artifacts/$TARGET" --acl private --follow-symlinks
URL="$CDN/$TARGET/index.html"
echo "URL=$URL" >> $GITHUB_OUTPUT
- name: Output mdbook url

- name: Output mdbook url
uses: ouzi-dev/[email protected]
if: github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name
with:
Expand Down
Loading