forked from leanprover-community/batteries
-
Notifications
You must be signed in to change notification settings - Fork 0
31 lines (26 loc) · 982 Bytes
/
nightly_merge_master.yml
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
# This job merges every commit to `main` into `nightly-testing`, resolving merge conflicts in favor of `nightly-testing`.
name: Merge main to nightly
on:
push:
branches:
- main
jobs:
merge-to-nightly:
if: github.repository_owner == 'leanprover-community'
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.NIGHTLY_TESTING }}
- name: Configure Git User
run: |
git config user.name "leanprover-community-mathlib4-bot"
git config user.email "leanprover-community-mathlib4-bot@users.noreply.github.com"
- name: Merge main to nightly favoring nightly changes
run: |
git checkout nightly-testing
git merge main --strategy-option ours --no-commit --allow-unrelated-histories
git commit -m "Merge main into nightly-testing"
git push origin nightly-testing