Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
8 changes: 7 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,20 @@ name: CI
on:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [ main ]
branches: [ main, 'rel/weekly' ]
pull_request:
branches: [ main ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
merge_group:

# Allow this workflow to be triggered by scheduled release workflows
workflow_run:
workflows: [ weekly-merge ]
types:
- completed

env:
DOTNET_VERSION: ${{ '9.0.x' }}
ENABLE_DIAGNOSTICS: true
Expand Down
36 changes: 36 additions & 0 deletions .github/workflows/weekly-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: weekly-merge

on:
schedule:
# Runs every Wednesday at 08:00 UTC (midnight PST / 1:00 AM PDT)
- cron: '0 8 * * 3'

# Allows manual triggering for convenience
workflow_dispatch:

jobs:
weekly-release:
runs-on: ubuntu-latest
permissions:
contents: write

steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
# Use a token with write permissions to push to the branch
token: ${{ secrets.GITHUB_TOKEN }}
fetch-depth: 0 # Fetch all history for merging

- name: Configure Git
run: |
git config user.name 'github-actions[bot]'
git config user.email 'github-actions[bot]@users.noreply.github.com'

- name: Merge main into rel/weekly
run: |
git fetch origin
git checkout rel/weekly
git reset --hard origin/rel/weekly
git merge --no-ff origin/main -m "Weekly merge of main into rel/weekly"
git push origin rel/weekly
Loading