Skip to content

no-release: [PE-7420] allow for merge queues #107

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
kivra-pauoli merged 2 commits into from
Sep 17, 2026
Merged

no-release: [PE-7420] allow for merge queues #107

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a23b669
Allow CI to run in merge queues
kivra-pauoli Sep 17, 2026
166bb71
Check out the PR head repository and commit
kivra-pauoli Sep 17, 2026
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: 17 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
---
name: ci
name: Continuous Integration
permissions:
contents: write

on:
# for feature branches and releases
# for feature branches
pull_request:
# for releases
push:
branches:
- main
# for merge queues
merge_group:
types:
- checks_requested
Comment thread
kivra-pauoli marked this conversation as resolved.

concurrency:
group: ${{ (github.ref != 'refs/heads/main') && format('{0}-{1}', github.ref, github.workflow) || github.run_id }}
Expand All @@ -19,6 +27,8 @@ jobs:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
fetch-depth: 0
repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
ref: ${{ github.event.pull_request.head.sha || github.ref }}
token: ${{secrets.GITHUB_TOKEN}}

- uses: erlef/setup-beam@54075bcc5e249e4758d363f27d099f55d843f124 # v1.24.1
Expand Down Expand Up @@ -55,8 +65,9 @@ jobs:
# since the 'git push' prevents the workflow's status from being reported
# In this case, we need to analyze the results of the previous
# 'Run Erlang Tests' step, and, when Ok, force- merge it!
- run: |
if [[ "${REF}" =~ refs/heads/renovate/.* ]]; then
- if: github.event_name == 'pull_request'
run: |
if [[ "${REF}" =~ ^renovate/.* ]]; then
echo "ℹ️ This appears to come from a Renovate PR. Trying rebar.lock update..."

ORIGIN="origin/${{ github.event.repository.default_branch }}"
Expand All @@ -71,12 +82,12 @@ jobs:
git config user.email "bot@renovateapp.com"
git add "${CHECK_FILE}"
git commit -m "auto-update(deps): Changes in ${CHECK_FILE}"
git push origin HEAD:"${REF}"
git push origin HEAD:"refs/heads/${REF}"
fi
fi
fi
env:
REF: ${{ github.ref }}
REF: ${{ github.head_ref }}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

release:
Expand Down