Skip to content

ci: Fix workflows to play nicely with merge queues #369

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

Merged
leandro-lucarella-frequenz merged 2 commits into from
Apr 28, 2023
Merged

ci: Fix workflows to play nicely with merge queues #369

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65edf14
ci: Fix checks for merge queues
llucax Apr 28, 2023
a0d63cf
ci: Remove debug step
llucax Apr 28, 2023
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
23 changes: 13 additions & 10 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
name: frequenz-sdk-python

on: [merge_group, pull_request, push, workflow_dispatch]
on:
merge_group:
pull_request:
push:
branches-ignore:
# Ignore pushes to merge queues.
# We only want to test the merge commit (`merge_group` event), the hashes
# in the push were already tested by the PR checks
- 'gh-readonly-queue/**'
workflow_dispatch:


jobs:
test:
Expand Down Expand Up @@ -68,15 +78,9 @@ jobs:
if-no-files-found: error

test-generate-docs:
# This could be github.event_name != 'push', but that's not being triggered
# for merge_group for some reason
if: github.event_name == 'pull_request' || github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch'
if: github.event_name != 'push'
runs-on: ubuntu-20.04
steps:
- name: DEBUG INFO
env:
GITHUB_EVENT_NAME: ${{ github.event_name }}
run: echo $GITHUB_EVENT_NAME
- name: Fetch sources
uses: actions/checkout@v3

Expand Down Expand Up @@ -109,8 +113,7 @@ jobs:

publish-docs:
needs: ["test", "build-dist"]
# We shouldn't need the reference name here, but `merge_group` is being executed as if it was `push`
if: github.event_name == 'push' && (github.ref == 'refs/heads/v0.x.x' || startsWith(github.ref, 'refs/tags/'))
if: github.event_name == 'push'
runs-on: ubuntu-20.04
permissions:
contents: write
Expand Down