From fc1a11e3865c6a3ab3e15210c45978fcf992bff4 Mon Sep 17 00:00:00 2001 From: David Mikael Blum Samuelsen Date: Wed, 9 Jul 2025 10:13:37 +0200 Subject: [PATCH 01/11] flake update --- .forgejo/workflows/update-dependencies.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .forgejo/workflows/update-dependencies.yml diff --git a/.forgejo/workflows/update-dependencies.yml b/.forgejo/workflows/update-dependencies.yml new file mode 100644 index 0000000..f0a7552 --- /dev/null +++ b/.forgejo/workflows/update-dependencies.yml @@ -0,0 +1,21 @@ + +name: update-dependencies +on: + workflow_dispatch: # allows manual triggering + schedule: + - cron: '0 6 * * *' # daily at 1 am EST/2 am EDT + +jobs: + update-dependencies: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: DeterminateSystems/nix-installer-action@v12 + - id: update + uses: DeterminateSystems/update-flake-lock@v23 + + - name: Merge + run: gh pr merge --auto "${{ steps.update.outputs.pull-request-number }}" --rebase + env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + if: ${{ steps.update.outputs.pull-request-number != '' }} \ No newline at end of file From b91c23e78d615729278a83b234bb10a9b249ffd2 Mon Sep 17 00:00:00 2001 From: David Mikael Blum Samuelsen Date: Wed, 9 Jul 2025 10:59:00 +0200 Subject: [PATCH 02/11] =?UTF-8?q?update=20fl=C3=A6k?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .forgejo/workflows/update-dependencies.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/.forgejo/workflows/update-dependencies.yml b/.forgejo/workflows/update-dependencies.yml index f0a7552..71b5f29 100644 --- a/.forgejo/workflows/update-dependencies.yml +++ b/.forgejo/workflows/update-dependencies.yml @@ -3,19 +3,17 @@ name: update-dependencies on: workflow_dispatch: # allows manual triggering schedule: - - cron: '0 6 * * *' # daily at 1 am EST/2 am EDT - + - cron: '0 6 * * *' jobs: update-dependencies: - runs-on: ubuntu-latest + runs-on: nixos-latest steps: - uses: actions/checkout@v4 - - uses: DeterminateSystems/nix-installer-action@v12 - id: update - uses: DeterminateSystems/update-flake-lock@v23 - - - name: Merge - run: gh pr merge --auto "${{ steps.update.outputs.pull-request-number }}" --rebase - env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - if: ${{ steps.update.outputs.pull-request-number != '' }} \ No newline at end of file + uses: https://github.com/DeterminateSystems/update-flake-lock@main + + # - name: Merge + # run: gh pr merge --auto "${{ steps.update.outputs.pull-request-number }}" --rebase + # env: + # GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + # if: ${{ steps.update.outputs.pull-request-number != '' }}s \ No newline at end of file From b3fed3ac87ceeadf6bc30e10f4303d80eb791846 Mon Sep 17 00:00:00 2001 From: David Mikael Blum Samuelsen Date: Wed, 9 Jul 2025 11:21:18 +0200 Subject: [PATCH 03/11] direct nix --- .forgejo/workflows/update-dependencies.yml | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/update-dependencies.yml b/.forgejo/workflows/update-dependencies.yml index 71b5f29..c9ff129 100644 --- a/.forgejo/workflows/update-dependencies.yml +++ b/.forgejo/workflows/update-dependencies.yml @@ -9,11 +9,21 @@ jobs: runs-on: nixos-latest steps: - uses: actions/checkout@v4 - - id: update - uses: https://github.com/DeterminateSystems/update-flake-lock@main + - run: nix flake update --commit-lock-file - # - name: Merge - # run: gh pr merge --auto "${{ steps.update.outputs.pull-request-number }}" --rebase - # env: - # GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - # if: ${{ steps.update.outputs.pull-request-number != '' }}s \ No newline at end of file + - name: Create Pull Request + uses: https://github.com/maxking/forgejo-create-pr@main + with: + # required + token: ${{ secrets.GH_TOKEN }} + # optional + base: 'main' + add-paths: '.' + commit-message: 'feat: automated changes' + pr-title: 'feat: new automated changes' + pr-body: 'This PR contains automated changes' + pr-condition-cmd: 'git status --porcelain' + + + +#https://forrestjacobs.com/keeping-nixos-systems-up-to-date-with-github-actions/ \ No newline at end of file From 93f1c678d9b57aa035d54ad5b701cb36b8f17432 Mon Sep 17 00:00:00 2001 From: David Mikael Blum Samuelsen Date: Wed, 9 Jul 2025 11:36:48 +0200 Subject: [PATCH 04/11] install node --- .forgejo/workflows/update-dependencies.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/update-dependencies.yml b/.forgejo/workflows/update-dependencies.yml index c9ff129..4e6d2e3 100644 --- a/.forgejo/workflows/update-dependencies.yml +++ b/.forgejo/workflows/update-dependencies.yml @@ -8,6 +8,7 @@ jobs: update-dependencies: runs-on: nixos-latest steps: + - run: nix-env -iA nixpkgs.nodejs - uses: actions/checkout@v4 - run: nix flake update --commit-lock-file From 35b288e4f523ee89a57246233b07a40d63d2f2f7 Mon Sep 17 00:00:00 2001 From: David Mikael Blum Samuelsen Date: Wed, 9 Jul 2025 11:44:13 +0200 Subject: [PATCH 05/11] experimental features --- .forgejo/workflows/update-dependencies.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.forgejo/workflows/update-dependencies.yml b/.forgejo/workflows/update-dependencies.yml index 4e6d2e3..98b89a0 100644 --- a/.forgejo/workflows/update-dependencies.yml +++ b/.forgejo/workflows/update-dependencies.yml @@ -9,6 +9,12 @@ jobs: runs-on: nixos-latest steps: - run: nix-env -iA nixpkgs.nodejs + + - name: Enable experimental features + run: | + mkdir -p ~/.config/nix + echo "experimental-features = nix-command flakes" >> ~/.config/nix/nix.conf + - uses: actions/checkout@v4 - run: nix flake update --commit-lock-file From aa7c13ec167f96a3cdf98e47732fbe550e7e2daa Mon Sep 17 00:00:00 2001 From: David Mikael Blum Samuelsen Date: Wed, 9 Jul 2025 11:54:44 +0200 Subject: [PATCH 06/11] setup git --- .forgejo/workflows/update-dependencies.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.forgejo/workflows/update-dependencies.yml b/.forgejo/workflows/update-dependencies.yml index 98b89a0..7d25dd9 100644 --- a/.forgejo/workflows/update-dependencies.yml +++ b/.forgejo/workflows/update-dependencies.yml @@ -16,6 +16,13 @@ jobs: echo "experimental-features = nix-command flakes" >> ~/.config/nix/nix.conf - uses: actions/checkout@v4 + + - run: | + git config --global user.name "${{ inputs.commit-user }}" >> $GITHUB_OUTPUT + git config --global user.email "${{ inputs.commit-email }}" >> $GITHUB_OUTPUT + shell: bash + name: "Configure git" + - run: nix flake update --commit-lock-file - name: Create Pull Request From 48b8c09b4ffbd1a5148476bb86d025acd7ed9acd Mon Sep 17 00:00:00 2001 From: David Mikael Blum Samuelsen Date: Wed, 9 Jul 2025 11:58:50 +0200 Subject: [PATCH 07/11] remove commit-flake-lock flag --- .forgejo/workflows/update-dependencies.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.forgejo/workflows/update-dependencies.yml b/.forgejo/workflows/update-dependencies.yml index 7d25dd9..39ef58b 100644 --- a/.forgejo/workflows/update-dependencies.yml +++ b/.forgejo/workflows/update-dependencies.yml @@ -16,14 +16,7 @@ jobs: echo "experimental-features = nix-command flakes" >> ~/.config/nix/nix.conf - uses: actions/checkout@v4 - - - run: | - git config --global user.name "${{ inputs.commit-user }}" >> $GITHUB_OUTPUT - git config --global user.email "${{ inputs.commit-email }}" >> $GITHUB_OUTPUT - shell: bash - name: "Configure git" - - - run: nix flake update --commit-lock-file + - run: nix flake update - name: Create Pull Request uses: https://github.com/maxking/forgejo-create-pr@main From 91530613b6c40ff96e04ce24337d2203b94dd122 Mon Sep 17 00:00:00 2001 From: David Mikael Blum Samuelsen Date: Wed, 9 Jul 2025 12:06:43 +0200 Subject: [PATCH 08/11] added curl --- .forgejo/workflows/update-dependencies.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/update-dependencies.yml b/.forgejo/workflows/update-dependencies.yml index 39ef58b..f77c2f8 100644 --- a/.forgejo/workflows/update-dependencies.yml +++ b/.forgejo/workflows/update-dependencies.yml @@ -9,6 +9,7 @@ jobs: runs-on: nixos-latest steps: - run: nix-env -iA nixpkgs.nodejs + - run: nix-env -iA nixpkgs.curl - name: Enable experimental features run: | From 6069d0ca4f1b13cbdff6439abe7f8903462132b4 Mon Sep 17 00:00:00 2001 From: David Mikael Blum Samuelsen Date: Wed, 9 Jul 2025 12:10:13 +0200 Subject: [PATCH 09/11] added jq --- .forgejo/workflows/update-dependencies.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/update-dependencies.yml b/.forgejo/workflows/update-dependencies.yml index f77c2f8..a61456c 100644 --- a/.forgejo/workflows/update-dependencies.yml +++ b/.forgejo/workflows/update-dependencies.yml @@ -10,6 +10,7 @@ jobs: steps: - run: nix-env -iA nixpkgs.nodejs - run: nix-env -iA nixpkgs.curl + - run: nix-env -iA nixpkgs.jq - name: Enable experimental features run: | From 2beafb2a60074e9c5207aad0dbcda41cc7d85511 Mon Sep 17 00:00:00 2001 From: David Mikael Blum Samuelsen Date: Wed, 9 Jul 2025 13:05:39 +0200 Subject: [PATCH 10/11] token reference --- .forgejo/workflows/update-dependencies.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/update-dependencies.yml b/.forgejo/workflows/update-dependencies.yml index a61456c..9a08c62 100644 --- a/.forgejo/workflows/update-dependencies.yml +++ b/.forgejo/workflows/update-dependencies.yml @@ -24,7 +24,7 @@ jobs: uses: https://github.com/maxking/forgejo-create-pr@main with: # required - token: ${{ secrets.GH_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} # optional base: 'main' add-paths: '.' From cd773a0ecccc774790b90ebd4158ec0baaef7526 Mon Sep 17 00:00:00 2001 From: Forgejo Bot Date: Wed, 9 Jul 2025 11:07:49 +0000 Subject: [PATCH 11/11] feat: automated changes --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 19b6da5..a9c4ec8 100644 --- a/flake.lock +++ b/flake.lock @@ -92,11 +92,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751801514, - "narHash": "sha256-Ve3ZTzcXEGt4IoXLsWqk35w3w4cH5G1MJb+gLdj/jtE=", + "lastModified": 1752059051, + "narHash": "sha256-Gp4Seks9XbIv4PGoQB8d1fcsK7r3GjVGS8U5BVaCrQg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4e3e6431fd60d653bb7f4fa5487e2c500d50f49f", + "rev": "5092a4ad88d4d85a408aaeba2eecb820f71bdf87", "type": "github" }, "original": {