Skip to content

Commit 048939b

Browse files
tomasoltomasol
committed
ci: Disable garnix hack for all other workflows
1 parent e201323 commit 048939b

8 files changed

Lines changed: 40 additions & 56 deletions

‎.github/workflows/check-test-integration.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,11 @@ jobs:
3434
- uses: nixbuild/nix-quick-install-action@v33
3535
with:
3636
github_access_token: ${{ secrets.GITHUB_TOKEN }}
37-
- name: Populate the nix store without Obelisk # Workaround for slow garnix cache
37+
nix_conf: |
38+
extra-substituters = https://cache.garnix.io
39+
extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g
40+
- name: Populate the nix store
3841
run: |
39-
nix develop .#noObelisk --command echo
40-
- name: Add garnix cache and populate the nix store with Obelisk
41-
run: |
42-
echo "extra-substituters = https://cache.garnix.io" >> ~/.config/nix/nix.conf
43-
echo "extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g" >> ~/.config/nix/nix.conf
4442
nix develop --command echo
4543
4644
- name: Run integration tests

‎.github/workflows/check-test-unit.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,11 @@ jobs:
3434
- uses: nixbuild/nix-quick-install-action@v33
3535
with:
3636
github_access_token: ${{ secrets.GITHUB_TOKEN }}
37-
- name: Populate the nix store without Obelisk # Workaround for slow garnix cache
37+
nix_conf: |
38+
extra-substituters = https://cache.garnix.io
39+
extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g
40+
- name: Populate the nix store
3841
run: |
39-
nix develop .#noObelisk --command echo
40-
- name: Add garnix cache and populate the nix store with Obelisk
41-
run: |
42-
echo "extra-substituters = https://cache.garnix.io" >> ~/.config/nix/nix.conf
43-
echo "extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g" >> ~/.config/nix/nix.conf
4442
nix develop --command echo
4543
4644
- name: Run unit tests

‎.github/workflows/check-verify-go.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,11 @@ jobs:
3434
- uses: nixbuild/nix-quick-install-action@v33
3535
with:
3636
github_access_token: ${{ secrets.GITHUB_TOKEN }}
37-
- name: Populate the nix store without Obelisk # Workaround for slow garnix cache
37+
nix_conf: |
38+
extra-substituters = https://cache.garnix.io
39+
extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g
40+
- name: Populate the nix store
3841
run: |
39-
nix develop .#noObelisk --command echo
40-
- name: Add garnix cache and populate the nix store with Obelisk
41-
run: |
42-
echo "extra-substituters = https://cache.garnix.io" >> ~/.config/nix/nix.conf
43-
echo "extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g" >> ~/.config/nix/nix.conf
4442
nix develop --command echo
4543
4644
- name: Build Rust Components

‎.github/workflows/check-verify-javascript.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,11 @@ jobs:
3434
- uses: nixbuild/nix-quick-install-action@v33
3535
with:
3636
github_access_token: ${{ secrets.GITHUB_TOKEN }}
37-
- name: Populate the nix store without Obelisk # Workaround for slow garnix cache
37+
nix_conf: |
38+
extra-substituters = https://cache.garnix.io
39+
extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g
40+
- name: Populate the nix store
3841
run: |
39-
nix develop .#noObelisk --command echo
40-
- name: Add garnix cache and populate the nix store with Obelisk
41-
run: |
42-
echo "extra-substituters = https://cache.garnix.io" >> ~/.config/nix/nix.conf
43-
echo "extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g" >> ~/.config/nix/nix.conf
4442
nix develop --command echo
4543
4644
- name: Build Rust Components

‎.github/workflows/check.yml‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,11 @@ jobs:
3131
- uses: nixbuild/nix-quick-install-action@v33
3232
with:
3333
github_access_token: ${{ secrets.GITHUB_TOKEN }}
34-
- name: Populate the nix store without Obelisk # Workaround for slow garnix cache
34+
nix_conf: |
35+
extra-substituters = https://cache.garnix.io
36+
extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g
37+
- name: Populate the nix store
3538
run: |
36-
nix develop .#noObelisk --command echo
37-
- name: Add garnix cache and populate the nix store with Obelisk
38-
run: |
39-
echo "extra-substituters = https://cache.garnix.io" >> ~/.config/nix/nix.conf
40-
echo "extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g" >> ~/.config/nix/nix.conf
4139
nix develop --command echo
4240
4341
- name: cargo fmt
@@ -51,13 +49,11 @@ jobs:
5149
- uses: nixbuild/nix-quick-install-action@v33
5250
with:
5351
github_access_token: ${{ secrets.GITHUB_TOKEN }}
54-
- name: Populate the nix store without Obelisk # Workaround for slow garnix cache
55-
run: |
56-
nix develop .#noObelisk --command echo
57-
- name: Add garnix cache and populate the nix store with Obelisk
52+
nix_conf: |
53+
extra-substituters = https://cache.garnix.io
54+
extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g
55+
- name: Populate the nix store
5856
run: |
59-
echo "extra-substituters = https://cache.garnix.io" >> ~/.config/nix/nix.conf
60-
echo "extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g" >> ~/.config/nix/nix.conf
6157
nix develop --command echo
6258
6359
- run: nix develop --command ./scripts/dev-deps.sh
@@ -81,13 +77,11 @@ jobs:
8177
- uses: nixbuild/nix-quick-install-action@v33
8278
with:
8379
github_access_token: ${{ secrets.GITHUB_TOKEN }}
84-
- name: Populate the nix store without Obelisk # Workaround for slow garnix cache
85-
run: |
86-
nix develop .#noObelisk --command echo
87-
- name: Add garnix cache and populate the nix store with Obelisk
80+
nix_conf: |
81+
extra-substituters = https://cache.garnix.io
82+
extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g
83+
- name: Populate the nix store
8884
run: |
89-
echo "extra-substituters = https://cache.garnix.io" >> ~/.config/nix/nix.conf
90-
echo "extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g" >> ~/.config/nix/nix.conf
9185
nix develop --command echo
9286
9387
- name: cargo clippy

‎.github/workflows/push-components.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,11 @@ jobs:
3131
- uses: nixbuild/nix-quick-install-action@v33
3232
with:
3333
github_access_token: ${{ secrets.GITHUB_TOKEN }}
34-
- name: Populate the nix store without Obelisk # Workaround for slow garnix cache
34+
nix_conf: |
35+
extra-substituters = https://cache.garnix.io
36+
extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g
37+
- name: Populate the nix store
3538
run: |
36-
nix develop .#noObelisk --command echo
37-
- name: Add garnix cache and populate the nix store with Obelisk
38-
run: |
39-
echo "extra-substituters = https://cache.garnix.io" >> ~/.config/nix/nix.conf
40-
echo "extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g" >> ~/.config/nix/nix.conf
4139
nix develop --command echo
4240
4341
- name: Log in to Docker Hub

‎.github/workflows/scheduled-bump-cargo-lock.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
- uses: nixbuild/nix-quick-install-action@v33
2929
with:
3030
github_access_token: ${{ secrets.GITHUB_TOKEN }}
31-
3231
- name: Populate the nix store without Obelisk
3332
run: |
3433
nix develop .#noObelisk --command echo

‎.github/workflows/sync-flake-lock.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@ jobs:
2828
curl https://raw.githubusercontent.com/obeli-sk/obelisk/refs/heads/latest/flake.lock -o flake.lock
2929
curl https://raw.githubusercontent.com/obeli-sk/obelisk/refs/heads/latest/rust-toolchain.toml -o rust-toolchain.toml
3030
31-
- name: Populate the nix store without Obelisk # Workaround for slow garnix cache
32-
run: |
33-
nix develop .#noObelisk --command echo
34-
- name: Add garnix cache and populate the nix store with Obelisk
31+
- uses: nixbuild/nix-quick-install-action@v33
32+
with:
33+
github_access_token: ${{ secrets.GITHUB_TOKEN }}
34+
nix_conf: |
35+
extra-substituters = https://cache.garnix.io
36+
extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g
37+
- name: Populate the nix store
3538
run: |
36-
echo "extra-substituters = https://cache.garnix.io" >> ~/.config/nix/nix.conf
37-
echo "extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g" >> ~/.config/nix/nix.conf
3839
nix develop --command echo
3940
4041
- name: Update dev-deps.txt
@@ -44,7 +45,7 @@ jobs:
4445
- name: Generate Unique Branch Name
4546
id: branch-name
4647
run: echo "branch_name=sync-flake-lock-$(date +'%Y%m%d-%H%M%S')" >> $GITHUB_OUTPUT
47-
48+
4849
- name: Configure Git
4950
run: |
5051
git config user.name "github-actions[bot]"

0 commit comments

Comments
 (0)