Skip to content

Commit

Permalink
Changed slack channel and cron schedule
Browse files Browse the repository at this point in the history
  • Loading branch information
Marcin-Radecki committed Nov 9, 2023
1 parent bba50a2 commit 3bf4168
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/automatic-upstream-merge-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@ name: Automatic upstream merge
on:
# run on 1th and 15th day of any month, ie fortnightly
schedule:
- cron: '* * 1,15 * *'
# for testing, remove before merge
push:
branches:
- A0-3232
- cron: '1 0 1,15 * *'

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

jobs:
main:
Expand All @@ -29,7 +25,7 @@ jobs:
target-branch: alephzero
upstream-repo-url: https://github.com/polkadot-js/apps
upstream-branch: master
slack-webhook-url: ${{ secrets.SLACK_INCOMING_WEBHOOK_TEMP_SLACK_NOTIFICATIONS }}
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 }}

0 comments on commit 3bf4168

Please sign in to comment.