diff options
| author | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2021-06-12 07:13:39 +0300 |
|---|---|---|
| committer | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2021-06-12 07:18:33 +0300 |
| commit | c6aa82cb572fb6c69d4290e2ccd3e8fd6b3ebcbd (patch) | |
| tree | 28d3a8715a4a7e2c4015fa4ffafba819dac306db /.github | |
| parent | ed6278916596840ece26ca001be0ecf0dc47d8e5 (diff) | |
Auto-merge -> auto-rebuild
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/automerge.yml | 9 | ||||
| -rw-r--r-- | .github/workflows/cmake_linux.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/cmake_macos.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/msbuild_win_x64.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/msbuild_win_x86.yml | 2 |
5 files changed, 14 insertions, 3 deletions
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 87154dc1..d0d5aa85 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -1,4 +1,4 @@ -name: Automerge +name: Auto-merge on: workflow_dispatch: @@ -6,7 +6,7 @@ on: - cron: '0 0 * * *' env: - MY_REPO: https://Cluster_M:${{secrets.GITHUB_TOKEN}}@github.com/ClusterM/fceux.git + MY_REPO: https://ClusterM:${{secrets.GITHUB_TOKEN}}@github.com/ClusterM/fceux.git MY_BRANCH: coolgirl MASTER_REPO: https://github.com/TASVideos/fceux.git MASTER_BRANCH: master @@ -16,12 +16,15 @@ jobs: runs-on: ubuntu-latest steps: - - name: Merge with master + - name: Merge with the master run: | git clone ${{env.MY_REPO}} -b ${{env.MY_BRANCH}} tmp cd tmp + OLD_COMMIT=$(git rev-parse HEAD) git config user.name "Automerge Bot" git config user.email "bot@example.com" git config pull.rebase false git pull ${{env.MASTER_REPO}} ${{env.MASTER_BRANCH}} + NEW_COMMIT=$(git rev-parse HEAD) git push + [ "$OLD_COMMIT" != "$NEW_COMMIT" ] && curl -X POST https://api.github.com/repos/ClusterM/fceux/dispatches -H 'Accept: application/vnd.github.everest-preview+json' -u ${{env.DISPATCH_KEY}} --data '{"event_type": "Automerge-rebuild"}' || true diff --git a/.github/workflows/cmake_linux.yml b/.github/workflows/cmake_linux.yml index f760f0c6..870b046e 100644 --- a/.github/workflows/cmake_linux.yml +++ b/.github/workflows/cmake_linux.yml @@ -6,6 +6,8 @@ on: pull_request: branches: [ coolgirl ] workflow_dispatch: + repository_dispatch: + types: [Automerge-rebuild] env: BUILD_TYPE: Release diff --git a/.github/workflows/cmake_macos.yml b/.github/workflows/cmake_macos.yml index fcd41f99..23bcc5f9 100644 --- a/.github/workflows/cmake_macos.yml +++ b/.github/workflows/cmake_macos.yml @@ -6,6 +6,8 @@ on: pull_request: branches: [ coolgirl ] workflow_dispatch: + repository_dispatch: + types: [Automerge-rebuild] env: BUILD_TYPE: Release diff --git a/.github/workflows/msbuild_win_x64.yml b/.github/workflows/msbuild_win_x64.yml index a150453d..4b68948d 100644 --- a/.github/workflows/msbuild_win_x64.yml +++ b/.github/workflows/msbuild_win_x64.yml @@ -6,6 +6,8 @@ on: pull_request: branches: [ coolgirl ] workflow_dispatch: + repository_dispatch: + types: [Automerge-rebuild] env: SOLUTION_FILE_PATH: vc/vc14_fceux.vcxproj diff --git a/.github/workflows/msbuild_win_x86.yml b/.github/workflows/msbuild_win_x86.yml index 90c091f8..a5152905 100644 --- a/.github/workflows/msbuild_win_x86.yml +++ b/.github/workflows/msbuild_win_x86.yml @@ -6,6 +6,8 @@ on: pull_request: branches: [ coolgirl ] workflow_dispatch: + repository_dispatch: + types: [Automerge-rebuild] env: SOLUTION_FILE_PATH: vc/vc14_fceux.vcxproj |