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

Jump to bottom

A0-3232: Added automatic merge upstream job #90

Merged
merged 7 commits into from
Nov 10, 2023
Merged

A0-3232: Added automatic merge upstream job #90

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ab80815
A0-3232: Automatic upstream merge
Marcin-Radecki Oct 18, 2023
bba50a2
Typo in action name
Marcin-Radecki Oct 18, 2023
3bf4168
Changed slack channel and cron schedule
Marcin-Radecki Nov 9, 2023
4e2ce0a
Merge branch 'alephzero' into A0-3232
Marcin-Radecki Nov 9, 2023
3515f00
Testing
Marcin-Radecki Nov 10, 2023
42d391d
Merge branch 'alephzero' into A0-3232
Marcin-Radecki Nov 10, 2023
5537688
Remove testing code.
Marcin-Radecki Nov 10, 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
31 changes: 31 additions & 0 deletions .github/workflows/automatic-upstream-merge-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
---
name: Automatic upstream merge

on:
# run on 7th and 21th day of any month, ie fortnightly
schedule:
- cron: '1 0 7,21 * *'

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: false

jobs:
main:
name: Merge polkadot-js/apps
runs-on: ubuntu-20.04
steps:
- name: Checkout source code
uses: actions/checkout@v3

- name: Merge upstream repo
uses: Cardinal-Cryptography/github-actions/test-upstream-merge@v3
with:
target-repo: Cardinal-Cryptography/azero-dev
target-branch: alephzero
upstream-repo-url: https://github.com/polkadot-js/apps
upstream-branch: master
slack-webhook-url: ${{ secrets.SLACK_INCOMING_WEBHOOK_DEV_ONDUTY }}
git-commit-author: ${{ secrets.AUTOCOMMIT_AUTHOR }}
git-commit-email: ${{ secrets.AUTOCOMMIT_EMAIL }}
gh-ci-token: ${{ secrets.CI_GH_TOKEN }}
Loading