From e315ce929338f6142ad01661df261257b07bb492 Mon Sep 17 00:00:00 2001 From: Techassi Date: Tue, 3 Dec 2024 13:48:16 +0100 Subject: [PATCH 1/4] ci: Update run-pre-commit action This now installs Nix via the run-pre-commit action instead. --- .github/workflows/pr_pre-commit.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr_pre-commit.yml b/.github/workflows/pr_pre-commit.yml index d107e683..64a99582 100644 --- a/.github/workflows/pr_pre-commit.yml +++ b/.github/workflows/pr_pre-commit.yml @@ -8,6 +8,7 @@ env: CARGO_TERM_COLOR: always RUST_TOOLCHAIN_VERSION: "1.80.1" HADOLINT_VERSION: "v1.17.6" + NIX_VERSION: "2.25.2" jobs: pre-commit: @@ -16,15 +17,14 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 - - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 #v30 - with: - github_access_token: ${{ secrets.GITHUB_TOKEN }} - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: node-version: 18 cache: yarn - run: yarn install --frozen-lockfile - - uses: stackabletech/actions/run-pre-commit@9bd13255f286e4b7a654617268abe1b2f37c3e0a # v0.3.0 + - uses: stackabletech/actions/run-pre-commit@e5be82f718f838b137928629cfc92b0baf978e63 # v0.3.0 TODO: Use tagged version with: rust: ${{ env.RUST_TOOLCHAIN_VERSION }} hadolint: ${{ env.HADOLINT_VERSION }} + nix: ${{ env.NIX_VERSION }} + nix-github-token: ${{ secrets.GITHUB_TOKEN }} From 8fbe7a96ca15e0f82e3efbbbb66a1e63d1931eb9 Mon Sep 17 00:00:00 2001 From: Techassi Date: Tue, 3 Dec 2024 13:50:44 +0100 Subject: [PATCH 2/4] chore: Test action validation (requires revert) --- .github/workflows/pr_pre-commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_pre-commit.yml b/.github/workflows/pr_pre-commit.yml index 64a99582..068cdddf 100644 --- a/.github/workflows/pr_pre-commit.yml +++ b/.github/workflows/pr_pre-commit.yml @@ -27,4 +27,4 @@ jobs: rust: ${{ env.RUST_TOOLCHAIN_VERSION }} hadolint: ${{ env.HADOLINT_VERSION }} nix: ${{ env.NIX_VERSION }} - nix-github-token: ${{ secrets.GITHUB_TOKEN }} + # nix-github-token: ${{ secrets.GITHUB_TOKEN }} Commented out for testing From d52f37e7baf5f25f124fcbffde921204996d2569 Mon Sep 17 00:00:00 2001 From: Techassi Date: Tue, 3 Dec 2024 13:52:07 +0100 Subject: [PATCH 3/4] Revert "chore: Test action validation (requires revert)" This reverts commit 8fbe7a96ca15e0f82e3efbbbb66a1e63d1931eb9. --- .github/workflows/pr_pre-commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_pre-commit.yml b/.github/workflows/pr_pre-commit.yml index 068cdddf..64a99582 100644 --- a/.github/workflows/pr_pre-commit.yml +++ b/.github/workflows/pr_pre-commit.yml @@ -27,4 +27,4 @@ jobs: rust: ${{ env.RUST_TOOLCHAIN_VERSION }} hadolint: ${{ env.HADOLINT_VERSION }} nix: ${{ env.NIX_VERSION }} - # nix-github-token: ${{ secrets.GITHUB_TOKEN }} Commented out for testing + nix-github-token: ${{ secrets.GITHUB_TOKEN }} From a9264d3d3e410658f3c9dc120ebf2249a36a7ba5 Mon Sep 17 00:00:00 2001 From: Techassi Date: Tue, 3 Dec 2024 14:07:27 +0100 Subject: [PATCH 4/4] chore: Bump run-pre-commit action to v0.4.0 --- .github/workflows/pr_pre-commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_pre-commit.yml b/.github/workflows/pr_pre-commit.yml index 64a99582..c255b089 100644 --- a/.github/workflows/pr_pre-commit.yml +++ b/.github/workflows/pr_pre-commit.yml @@ -22,7 +22,7 @@ jobs: node-version: 18 cache: yarn - run: yarn install --frozen-lockfile - - uses: stackabletech/actions/run-pre-commit@e5be82f718f838b137928629cfc92b0baf978e63 # v0.3.0 TODO: Use tagged version + - uses: stackabletech/actions/run-pre-commit@5901c3b1455488820c4be367531e07c3c3e82538 # v0.4.0 with: rust: ${{ env.RUST_TOOLCHAIN_VERSION }} hadolint: ${{ env.HADOLINT_VERSION }}