From 00906566b88b19fdf546a1f627b9159dabe5fb48 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 27 May 2024 12:50:45 +0900 Subject: [PATCH 1/3] Bump and pin to NixOS 24.05 --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 0e2a6e8..1770f21 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1716542732, + "narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "d12251ef6e8e6a46e05689eeccd595bdbd3c9e60", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index e25d82b..678b4ad 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ # - https://discourse.nixos.org/t/differences-between-nix-channels/13998 # How to update the revision # - `nix flake update --commit-lock-file` # https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-flake-update.html - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; flake-utils.url = "github:numtide/flake-utils"; }; From ce4fd80b2751219a4a5e05cc253bf9c392a2dc1b Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 27 May 2024 12:50:54 +0900 Subject: [PATCH 2/3] `git ls-files '.github/workflows/*.yml' | xargs nix run github:kachick/selfup/v1.1.2 -- migrate` --- .github/workflows/ci.yml | 2 +- .github/workflows/lint.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7fdd394..2fb6b56 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,5 +64,5 @@ jobs: - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 - uses: denoland/setup-deno@041b854f97b325bd60e53e9dc2de9cb9f9ac0cba # v1.1.4 with: - deno-version: '1.43.5' # selfup { "regex": "\\d[^']+", "script": "deno --version | head -n 1 | cut -d ' ' -f 2" } + deno-version: '1.43.5' # selfup {"extract":"\\d[^']+","replacer":["bash","-c","deno --version | head -n 1 | cut -d ' ' -f 2"]} - run: deno lint diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3041d7b..bdf6fda 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,14 +17,14 @@ jobs: - uses: actions/checkout@v4 - uses: dprint/check@v2.2 with: - dprint-version: '0.45.1' # selfup { "regex": "\\d[^']+", "script": "dprint --version | cut -d ' ' -f 2" } + dprint-version: '0.45.1' # selfup {"extract":"\\d[^']+","replacer":["bash","-c","dprint --version | cut -d ' ' -f 2"]} typos: timeout-minutes: 15 runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - - uses: crate-ci/typos@v1.21.0 # selfup { "regex": "\\d\\.\\d+\\.\\d+", "script": "typos --version | cut -d ' ' -f 2" } + - uses: crate-ci/typos@v1.21.0 # selfup {"extract":"\\d\\.\\d+\\.\\d+","replacer":["bash","-c","typos --version | cut -d ' ' -f 2"]} with: files: | . From da3859de849325760a4b55ed2a7b9463fd841f39 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 27 May 2024 12:51:26 +0900 Subject: [PATCH 3/3] Bump selfup action to follow new schema --- .github/workflows/bump-flake-lock-and-selfup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-flake-lock-and-selfup.yml b/.github/workflows/bump-flake-lock-and-selfup.yml index 25ed7f3..3a93bae 100644 --- a/.github/workflows/bump-flake-lock-and-selfup.yml +++ b/.github/workflows/bump-flake-lock-and-selfup.yml @@ -11,7 +11,7 @@ on: jobs: bump: - uses: kachick/selfup/.github/workflows/reusable-bump-flake-lock-and-selfup.yml@action-v1 + uses: kachick/selfup/.github/workflows/reusable-bump-flake-lock-and-selfup.yml@v1.1.2 if: (github.event.sender.login == 'kachick') || (github.event_name != 'pull_request') with: dry-run: ${{ github.event_name == 'pull_request' }}