From 2a376ef235c73503ac81263e319ad9bb5ce17d3d Mon Sep 17 00:00:00 2001 From: Chuck Grindel Date: Mon, 11 Dec 2023 11:37:35 -0700 Subject: [PATCH 1/2] chore: use tweag/run-nix-shell --- .github/workflows/workflow.yaml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 3f6380e..25d3072 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -67,8 +67,10 @@ jobs: ln -s ../.bazelrc.local example/.bazelrc.local ln -s ../../.bazelrc.local tests/alternative-deps/.bazelrc.local - name: Build & test - run: nix-shell --pure --run 'bazel test --config=${{ matrix.ghc-version }} --test_output=all //...' if: ${{ !matrix.enable-bzlmod }} + uses: tweag/run-nix-shell@51bed9187838a0ac93b2ae2ea6216691a43e5f84 # initial_files branch + with: + run: bazel test --config=${{ matrix.ghc-version }} --test_output=all //... - name: Test the example run: | cd example @@ -125,15 +127,19 @@ jobs: nix-shell --pure --run 'bazel run //:gazelle-update-repos --config=${{ matrix.ghc-version }}' nix-shell --pure --run 'bazel test //... --config=${{ matrix.ghc-version }}' - name: Test alternative dependencies - run: | - cd tests/alternative-deps - nix-shell --pure --run 'bazel run //:gazelle --config=${{ matrix.ghc-version }}' - nix-shell --pure --run 'bazel run //:gazelle-update-repos --config=${{ matrix.ghc-version }}' - nix-shell --pure --run 'bazel test //... --config=${{ matrix.ghc-version }}' if: ${{ !matrix.enable-bzlmod }} + uses: tweag/run-nix-shell@51bed9187838a0ac93b2ae2ea6216691a43e5f84 # initial_files branch + with: + working-directory: tests/alternative-deps + run: | + bazel run //:gazelle --config=${{ matrix.ghc-version }} + bazel run //:gazelle-update-repos --config=${{ matrix.ghc-version }} + bazel test //... --config=${{ matrix.ghc-version }} - name: Test for buildifier suggestions - run: nix-shell --pure --run 'bazel run //:buildifier-diff' if: ${{ !matrix.enable-bzlmod }} + uses: tweag/run-nix-shell@51bed9187838a0ac93b2ae2ea6216691a43e5f84 # initial_files branch + with: + run: bazel run //:buildifier-diff all_ci_tests: runs-on: ubuntu-latest From a37f6606f016b0b4afc35036c3e2d01af34d0b10 Mon Sep 17 00:00:00 2001 From: Chuck Grindel Date: Tue, 12 Dec 2023 09:58:06 -0700 Subject: [PATCH 2/2] Fix version tags --- .github/workflows/workflow.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 25d3072..32f9151 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -68,7 +68,7 @@ jobs: ln -s ../../.bazelrc.local tests/alternative-deps/.bazelrc.local - name: Build & test if: ${{ !matrix.enable-bzlmod }} - uses: tweag/run-nix-shell@51bed9187838a0ac93b2ae2ea6216691a43e5f84 # initial_files branch + uses: tweag/run-nix-shell@v0 with: run: bazel test --config=${{ matrix.ghc-version }} --test_output=all //... - name: Test the example @@ -128,7 +128,7 @@ jobs: nix-shell --pure --run 'bazel test //... --config=${{ matrix.ghc-version }}' - name: Test alternative dependencies if: ${{ !matrix.enable-bzlmod }} - uses: tweag/run-nix-shell@51bed9187838a0ac93b2ae2ea6216691a43e5f84 # initial_files branch + uses: tweag/run-nix-shell@v0 with: working-directory: tests/alternative-deps run: | @@ -137,7 +137,7 @@ jobs: bazel test //... --config=${{ matrix.ghc-version }} - name: Test for buildifier suggestions if: ${{ !matrix.enable-bzlmod }} - uses: tweag/run-nix-shell@51bed9187838a0ac93b2ae2ea6216691a43e5f84 # initial_files branch + uses: tweag/run-nix-shell@v0 with: run: bazel run //:buildifier-diff