diff options
| -rw-r--r-- | .github/actions/flake-update/action.yaml | 36 | ||||
| -rw-r--r-- | .github/workflows/update-inputs.yaml | 22 | ||||
| -rw-r--r-- | .github/workflows/update-lock.yaml | 37 | ||||
| -rw-r--r-- | .github/workflows/update-nixpkgs.yaml | 24 | ||||
| -rw-r--r-- | README.md | 2 |
5 files changed, 54 insertions, 67 deletions
diff --git a/.github/actions/flake-update/action.yaml b/.github/actions/flake-update/action.yaml deleted file mode 100644 index ac3e3b7..0000000 --- a/.github/actions/flake-update/action.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: "update flake inputs" -description: "wrapper around DeterminateSystems/update-flake-lock" -inputs: - commit-msg: - required: true - github-token: - description: "github read token for increasing rate limits" - required: true - default: "" - inputs: - description: "flake inputs to update" - required: false - default: "" -runs: - using: "composite" - steps: - - name: install nix - uses: cachix/install-nix-action@v22 - with: - github_access_token: ${{ inputs.github-token }} - - - name: run update-flake-lock - uses: DeterminateSystems/update-flake-lock@v19 - id: update - with: - commit-msg: ${{ inputs.commit-msg }} - inputs: ${{ inputs.inputs }} - pr-title: ${{ inputs.commit-msg }} - token: ${{ inputs.github-token }} - - - name: auto-merge pull request - shell: bash - run: gh pr merge --auto --rebase "$PR_ID" - env: - GITHUB_TOKEN: ${{ inputs.github-token }} - PR_ID: ${{ steps.update.outputs.pull-request-number }} diff --git a/.github/workflows/update-inputs.yaml b/.github/workflows/update-inputs.yaml index 77b9409..a18c59d 100644 --- a/.github/workflows/update-inputs.yaml +++ b/.github/workflows/update-inputs.yaml @@ -1,9 +1,9 @@ -name: update all inputs +name: update all flake inputs on: - #schedule: - # # run every saturday - # - cron: "0 0 * * 6" + schedule: + # run every saturday + - cron: "0 0 * * 6" workflow_dispatch: permissions: @@ -11,13 +11,7 @@ permissions: pull-requests: write jobs: - update-lock: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - - uses: ./.github/actions/flake-update - with: - commit-msg: "flake: update all inputs" - github-token: ${{ github.token }} + update: + uses: ./.github/workflows/update-lock.yaml + with: + commit-msg: "flake: update all inputs" diff --git a/.github/workflows/update-lock.yaml b/.github/workflows/update-lock.yaml new file mode 100644 index 0000000..0bf8b1d --- /dev/null +++ b/.github/workflows/update-lock.yaml @@ -0,0 +1,37 @@ +name: update flake lock + +on: + workflow_call: + inputs: + commit-msg: + description: summary for lockfile commit + required: true + type: string + inputs: + description: flake inputs to update + required: false + default: "" + type: string + +jobs: + update: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: DeterminateSystems/nix-installer-action@main + + - name: update lockfile + uses: DeterminateSystems/update-flake-lock@v20 + id: update + with: + commit-msg: ${{ inputs.commit-msg }} + inputs: ${{ inputs.inputs }} + pr-title: ${{ inputs.commit-msg }} + token: ${{ github.token }} + + - name: enable auto-merge + shell: bash + run: gh pr merge --auto --rebase "$PR_ID" + env: + GITHUB_TOKEN: ${{ github.token }} + PR_ID: ${{ steps.update.outputs.pull-request-number }} diff --git a/.github/workflows/update-nixpkgs.yaml b/.github/workflows/update-nixpkgs.yaml index 819cb2a..116cc4b 100644 --- a/.github/workflows/update-nixpkgs.yaml +++ b/.github/workflows/update-nixpkgs.yaml @@ -1,9 +1,9 @@ -name: update nixpkgs inputs +name: update nixpkgs flake 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: @@ -11,14 +11,8 @@ permissions: pull-requests: write jobs: - update-nixpkgs: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - - uses: ./.github/actions/flake-update - with: - commit-msg: "flake: update nixpkgs inputs" - github-token: ${{ github.token }} - inputs: nixpkgs nixpkgs-stable + update: + uses: ./.github/workflows/update-lock.yaml + with: + commit-msg: "flake: update nixpkgs inputs" + inputs: "nixpkgs nixpkgs-stable" @@ -4,7 +4,6 @@ [](https://nixos.org/) [](https://garnix.io) - greasy taco i love ## my machines @@ -44,7 +43,6 @@ there are some amazing tools i use to make/manage this flake that i would highly - [flake-parts](https://github.com/hercules-ci/flake-parts) - [ragenix](https://github.com/yaxitech/ragenix) - ## fun screenshots <details> |