Skip to content

Commit 9ad092e

Browse files
committed
[ci] Speed up by fixing the nix instalation in ubuntu containers
1 parent 67e2ade commit 9ad092e

File tree

1 file changed

+5
-23
lines changed

1 file changed

+5
-23
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,9 @@ jobs:
8989
steps:
9090
- uses: actions/checkout@v5
9191

92-
# This step is a workaround and should be removed when the container is fixed.
93-
- name: Uninstall Nix
94-
run: |
95-
sudo rm -rf /etc/nix /etc/profile.d/nix.sh /etc/tmpfiles.d/nix-daemon.conf \
96-
/nix ~root/.nix-channels ~root/.nix-defexpr ~root/.nix-profile ~root/.cache/nix
97-
9892
- name: Install Nix
99-
uses: cachix/install-nix-action@v27
100-
with:
101-
extra_nix_config: |
102-
substituters = https://nix-cache.lowrisc.org/public/ https://cache.nixos.org/
103-
trusted-public-keys = nix-cache.lowrisc.org-public-1:O6JLD0yXzaJDPiQW1meVu32JIDViuaPtGDfjlOopU7o= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
93+
run: |
94+
sudo chown -R $(whoami) /nix
10495
10596
- name: Hash Bitstream
10697
id: hash-bitstream
@@ -122,22 +113,13 @@ jobs:
122113
123114
fpga-test:
124115
runs-on: ["self-hosted", "ubuntu-22.04-fpga", "genesys2"]
125-
needs: fpga-build
116+
# needs: fpga-build
126117
steps:
127118
- uses: actions/checkout@v5
128119

129-
# This step is a workaround and should be removed when the container is fixed.
130-
- name: Uninstall Nix
131-
run: |
132-
sudo rm -rf /etc/nix /etc/profile.d/nix.sh /etc/tmpfiles.d/nix-daemon.conf \
133-
/nix ~root/.nix-channels ~root/.nix-defexpr ~root/.nix-profile ~root/.cache/nix
134-
135120
- name: Install Nix
136-
uses: cachix/install-nix-action@v27
137-
with:
138-
extra_nix_config: |
139-
substituters = https://nix-cache.lowrisc.org/public/ https://cache.nixos.org/
140-
trusted-public-keys = nix-cache.lowrisc.org-public-1:O6JLD0yXzaJDPiQW1meVu32JIDViuaPtGDfjlOopU7o= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
121+
run: |
122+
sudo chown -R $(whoami) /nix
141123
142124
- uses: actions/cache@v5
143125
with:

0 commit comments

Comments
 (0)