From 9c71189567163ef53acfbfd7c39384683a592290 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 29 May 2023 01:15:01 -0400 Subject: !back to hercules-ci hydra is a little annoying to configure, especially with features like github prs --- .github/actions/flake-update/action.yaml | 11 +++++++---- .github/workflows/update-inputs.yaml | 6 +++--- .github/workflows/update-nixpkgs.yaml | 6 +++--- 3 files changed, 13 insertions(+), 10 deletions(-) (limited to '.github') diff --git a/.github/actions/flake-update/action.yaml b/.github/actions/flake-update/action.yaml index f26c383..62f3695 100644 --- a/.github/actions/flake-update/action.yaml +++ b/.github/actions/flake-update/action.yaml @@ -22,12 +22,15 @@ runs: github_access_token: ${{ inputs.github-token }} - uses: DeterminateSystems/update-flake-lock@v19 + id: update with: commit-msg: ${{ inputs.commit-msg }} pr-title: ${{ inputs.commit-msg }} - pr-body: | - Automated changes by the [update-flake-lock](https://github.com/DeterminateSystems/update-flake-lock) GitHub Action. - - bors r+ nix-options: "--accept-flake-config" token: ${{ inputs.update-token }} + + - name: auto-merge pull request + run: gh pr merge --auto --squash "$PR_ID" + env: + GITHUB_TOKEN: ${{ inputs.update-token }} + PR_ID: ${{ steps.update.outputs.pull-request-number }} diff --git a/.github/workflows/update-inputs.yaml b/.github/workflows/update-inputs.yaml index 59fed45..3103629 100644 --- a/.github/workflows/update-inputs.yaml +++ b/.github/workflows/update-inputs.yaml @@ -1,9 +1,9 @@ name: update all inputs on: - schedule: - # run every saturday - - cron: "0 0 * * 6" + # schedule: + # # run every saturday + # - cron: "0 0 * * 6" workflow_dispatch: permissions: read-all diff --git a/.github/workflows/update-nixpkgs.yaml b/.github/workflows/update-nixpkgs.yaml index ccb04d3..81fbe9e 100644 --- a/.github/workflows/update-nixpkgs.yaml +++ b/.github/workflows/update-nixpkgs.yaml @@ -1,9 +1,9 @@ name: update nixpkgs inputs on: - schedule: - # run daily at 0:00 utc - - cron: "0 0 * * *" + # schedule: + # # run daily at 0:00 utc + # - cron: "0 0 * * *" workflow_dispatch: permissions: read-all -- cgit v1.2.3