diff options
| author |  Amine Mouafik <amine@mouafik.fr> | 2019-09-24 10:55:15 +0700 |
|---|---|---|
| committer | Amine Mouafik <amine@mouafik.fr> | 2019-09-24 10:55:15 +0700 |
| commit | d88b04b05b64b6fea38e226c3bf344f58c2ceefb (patch) | |
| tree | 37d0453f258414f483c2ce27623b12de6ce1b09f /.github | |
| parent | Trigger pull request build after replugging Travis (diff) | |
| parent | Add darkreader to feature list and changelog (diff) | |
| download | ferdium-app-d88b04b05b64b6fea38e226c3bf344f58c2ceefb.tar.gz ferdium-app-d88b04b05b64b6fea38e226c3bf344f58c2ceefb.tar.zst ferdium-app-d88b04b05b64b6fea38e226c3bf344f58c2ceefb.zip | |
Merge branch 'master' into feat/macos-signing
Diffstat (limited to '.github')
| -rw-r--r-- | .github/FUNDING.yml | 3 | ||||
| -rw-r--r-- | .github/workflow/repo-sync.yml | 25 |
2 files changed, 25 insertions, 3 deletions
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index ea93748ed..000000000 --- a/.github/FUNDING.yml +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | # These are supported funding model platforms | ||
| 2 | |||
| 3 | github: [adlk, vantezzen, kytwb] | ||
diff --git a/.github/workflow/repo-sync.yml b/.github/workflow/repo-sync.yml new file mode 100644 index 000000000..fce0721c7 --- /dev/null +++ b/.github/workflow/repo-sync.yml | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | name: Repo Sync | ||
| 2 | |||
| 3 | on: | ||
| 4 | schedule: | ||
| 5 | - cron: "*/15 * * * *" | ||
| 6 | |||
| 7 | jobs: | ||
| 8 | repo-sync: | ||
| 9 | name: Repo Sync | ||
| 10 | runs-on: ubuntu-latest | ||
| 11 | steps: | ||
| 12 | - uses: actions/checkout@v1 | ||
| 13 | - uses: repo-sync/github-sync@v2 | ||
| 14 | name: Sync repository to branch | ||
| 15 | with: | ||
| 16 | source_repo: ${{ secrets.SOURCE_REPO }} | ||
| 17 | source_branch: "master" | ||
| 18 | destination_branch: ${{ secrets.INTERMEDIATE_BRANCH }} | ||
| 19 | github_token: ${{ secrets.GITHUB_TOKEN }} | ||
| 20 | - uses: repo-sync/pull-request@v2 | ||
| 21 | name: Create pull request | ||
| 22 | with: | ||
| 23 | source_branch: ${{ secrets.INTERMEDIATE_BRANCH }} | ||
| 24 | destination_branch: "master" | ||
| 25 | github_token: ${{ secrets.GITHUB_TOKEN }} | ||