diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/.github/workflows')
| -rw-r--r-- | infra/libkookie/nixpkgs/.github/workflows/editorconfig.yml | 6 | ||||
| -rw-r--r-- | infra/libkookie/nixpkgs/.github/workflows/merge-staging.yml | 39 |
2 files changed, 43 insertions, 2 deletions
diff --git a/infra/libkookie/nixpkgs/.github/workflows/editorconfig.yml b/infra/libkookie/nixpkgs/.github/workflows/editorconfig.yml index 7f1808d35f2c..be7a4ba02b61 100644 --- a/infra/libkookie/nixpkgs/.github/workflows/editorconfig.yml +++ b/infra/libkookie/nixpkgs/.github/workflows/editorconfig.yml @@ -2,6 +2,8 @@ name: "Checking EditorConfig" on: pull_request: + branches-ignore: + - 'release-**' jobs: tests: @@ -14,7 +16,7 @@ jobs: - name: Fetch editorconfig-checker if: env.GIT_DIFF env: - ECC_VERSION: "2.1.0" + ECC_VERSION: "2.2.0" ECC_URL: "https://github.com/editorconfig-checker/editorconfig-checker/releases/download" run: | curl -sSf -O -L -C - "$ECC_URL/$ECC_VERSION/ec-linux-amd64.tar.gz" && \ @@ -23,5 +25,5 @@ jobs: - name: Checking EditorConfig if: env.GIT_DIFF run: | - ./bin/editorconfig-checker -disable-indentation \ + ./bin/editorconfig-checker -disable-indent-size \ ${{ env.GIT_DIFF }} diff --git a/infra/libkookie/nixpkgs/.github/workflows/merge-staging.yml b/infra/libkookie/nixpkgs/.github/workflows/merge-staging.yml new file mode 100644 index 000000000000..1aadef16328a --- /dev/null +++ b/infra/libkookie/nixpkgs/.github/workflows/merge-staging.yml @@ -0,0 +1,39 @@ +name: "merge staging(-next)" + +on: + schedule: + # * is a special character in YAML so you have to quote this string + # Merge every 6 hours + - cron: '0 */6 * * *' + +jobs: + sync-branch: + if: github.repository == 'NixOS/nixpkgs' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Merge master into staging-next + uses: devmasx/merge-branch@v1.3.1 + with: + type: now + from_branch: master + target_branch: staging-next + github_token: ${{ secrets.GITHUB_TOKEN }} + + - name: Merge staging-next into staging + uses: devmasx/merge-branch@v1.3.1 + with: + type: now + from_branch: staging-next + target_branch: staging + github_token: ${{ secrets.GITHUB_TOKEN }} + + - name: Comment on failure + uses: peter-evans/create-or-update-comment@v1 + if: ${{ failure() }} + with: + issue-number: 105153 + body: | + An automatic merge [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). + |