Skip to content

Commit 803e16b

Browse files
matttrachmatttrach
authored
fix: clean up nix install script (#2230) (#2237)
Signed-off-by: matttrach <matt.trachier@suse.com>
1 parent da188ed commit 803e16b

4 files changed

Lines changed: 84 additions & 39 deletions

File tree

‎.github/workflows/manual-rc-release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ jobs:
120120
cache: true
121121
- name: install-nix
122122
run: |
123-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
124-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
125-
chmod +x install.sh
126-
./install.sh
123+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
124+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
125+
chmod +x nix_install.sh
126+
./nix_install.sh
127127
source /home/runner/.nix-profile/etc/profile.d/nix.sh
128128
nix --version
129-
which nix
129+
rm -f ./nix_install.sh
130130
- name: Run GoReleaser
131131
shell: /home/runner/.nix-profile/bin/nix develop --ignore-environment --extra-experimental-features nix-command --extra-experimental-features flakes --keep TAG --keep GPG_KEY_ID --keep GPG_PASSPHRASE --keep HOME --keep SSH_AUTH_SOCK --keep GITHUB_TOKEN --keep NIX_SSL_CERT_FILE --keep NIX_ENV_LOADED --keep TERM --command bash -e {0}
132132
env:

‎.github/workflows/manual-release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@ jobs:
113113
cache: true
114114
- name: install-nix
115115
run: |
116-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
117-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
118-
chmod +x install.sh
119-
./install.sh
116+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
117+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
118+
chmod +x nix_install.sh
119+
./nix_install.sh
120120
source /home/runner/.nix-profile/etc/profile.d/nix.sh
121121
nix --version
122-
which nix
122+
rm -f ./nix_install.sh
123123
- name: Run GoReleaser
124124
shell: /home/runner/.nix-profile/bin/nix develop --ignore-environment --extra-experimental-features nix-command --extra-experimental-features flakes --keep HOME --keep SSH_AUTH_SOCK --keep TAG --keep GPG_KEY_ID --keep GPG_PASSPHRASE --keep GITHUB_TOKEN --keep NIX_SSL_CERT_FILE --keep NIX_ENV_LOADED --keep TERM --command bash -e {0}
125125
env:

‎.github/workflows/pull_request.yaml‎

Lines changed: 54 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,25 @@ jobs:
1919
VERSION: ${{ github.ref_name }}
2020
run: |
2121
make build
22-
22+
test:
23+
runs-on: ubuntu-latest
24+
steps:
25+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 https://github.com/actions/checkout
26+
with:
27+
fetch-depth: 0
28+
- name: install-nix
29+
run: |
30+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
31+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
32+
chmod +x nix_install.sh
33+
./nix_install.sh
34+
source /home/runner/.nix-profile/etc/profile.d/nix.sh
35+
nix --version
36+
rm -f ./nix_install.sh
37+
- name: Run make test
38+
shell: /home/runner/.nix-profile/bin/nix develop --ignore-environment --extra-experimental-features nix-command --extra-experimental-features flakes --keep HOME --keep SSH_AUTH_SOCK --keep GITHUB_TOKEN --keep NIX_SSL_CERT_FILE --keep NIX_ENV_LOADED --keep TERM --command bash -e {0}
39+
run: |
40+
make test
2341
terraform:
2442
name: 'Terraform'
2543
runs-on: ubuntu-latest
@@ -29,10 +47,13 @@ jobs:
2947
fetch-depth: 0
3048
- name: install-nix
3149
run: |
32-
curl -L https://nixos.org/nix/install | sh
50+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
51+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
52+
chmod +x nix_install.sh
53+
./nix_install.sh
3354
source /home/runner/.nix-profile/etc/profile.d/nix.sh
3455
nix --version
35-
which nix
56+
rm -f ./nix_install.sh
3657
- name: lint terraform
3758
shell: /home/runner/.nix-profile/bin/nix develop --ignore-environment --extra-experimental-features nix-command --extra-experimental-features flakes --keep HOME --keep SSH_AUTH_SOCK --keep GITHUB_TOKEN --keep AWS_ROLE --keep AWS_REGION --keep AWS_DEFAULT_REGION --keep AWS_ACCESS_KEY_ID --keep AWS_SECRET_ACCESS_KEY --keep AWS_SESSION_TOKEN --keep UPDATECLI_GPGTOKEN --keep UPDATECLI_GITHUB_TOKEN --keep UPDATECLI_GITHUB_ACTOR --keep GPG_SIGNING_KEY --keep NIX_SSL_CERT_FILE --keep NIX_ENV_LOADED --keep TERM --command bash -e {0}
3859
run: |
@@ -48,10 +69,13 @@ jobs:
4869
fetch-depth: 0
4970
- name: install-nix
5071
run: |
51-
curl -L https://nixos.org/nix/install | sh
72+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
73+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
74+
chmod +x nix_install.sh
75+
./nix_install.sh
5276
source /home/runner/.nix-profile/etc/profile.d/nix.sh
5377
nix --version
54-
which nix
78+
rm -f ./nix_install.sh
5579
- name: action lint
5680
shell: /home/runner/.nix-profile/bin/nix develop --ignore-environment --extra-experimental-features nix-command --extra-experimental-features flakes --keep HOME --keep SSH_AUTH_SOCK --keep GITHUB_TOKEN --keep AWS_ROLE --keep AWS_REGION --keep AWS_DEFAULT_REGION --keep AWS_ACCESS_KEY_ID --keep AWS_SECRET_ACCESS_KEY --keep AWS_SESSION_TOKEN --keep UPDATECLI_GPGTOKEN --keep UPDATECLI_GITHUB_TOKEN --keep UPDATECLI_GITHUB_ACTOR --keep GPG_SIGNING_KEY --keep NIX_SSL_CERT_FILE --keep NIX_ENV_LOADED --keep TERM --command bash -e {0}
5781
run: actionlint
@@ -65,10 +89,13 @@ jobs:
6589
fetch-depth: 0
6690
- name: install-nix
6791
run: |
68-
curl -L https://nixos.org/nix/install | sh
92+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
93+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
94+
chmod +x nix_install.sh
95+
./nix_install.sh
6996
source /home/runner/.nix-profile/etc/profile.d/nix.sh
7097
nix --version
71-
which nix
98+
rm -f ./nix_install.sh
7299
- name: check
73100
shell: /home/runner/.nix-profile/bin/nix develop --ignore-environment --extra-experimental-features nix-command --extra-experimental-features flakes --keep HOME --keep SSH_AUTH_SOCK --keep GITHUB_TOKEN --keep AWS_ROLE --keep AWS_REGION --keep AWS_DEFAULT_REGION --keep AWS_ACCESS_KEY_ID --keep AWS_SECRET_ACCESS_KEY --keep AWS_SESSION_TOKEN --keep UPDATECLI_GPGTOKEN --keep UPDATECLI_GITHUB_TOKEN --keep UPDATECLI_GITHUB_ACTOR --keep GPG_SIGNING_KEY --keep NIX_SSL_CERT_FILE --keep NIX_ENV_LOADED --keep TERM --command bash -e {0}
74101
run: |
@@ -86,10 +113,13 @@ jobs:
86113
fetch-depth: 0
87114
- name: install-nix
88115
run: |
89-
curl -L https://nixos.org/nix/install | sh
116+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
117+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
118+
chmod +x nix_install.sh
119+
./nix_install.sh
90120
source /home/runner/.nix-profile/etc/profile.d/nix.sh
91121
nix --version
92-
which nix
122+
rm -f ./nix_install.sh
93123
- name: check
94124
shell: /home/runner/.nix-profile/bin/nix develop --ignore-environment --extra-experimental-features nix-command --extra-experimental-features flakes --keep HOME --keep SSH_AUTH_SOCK --keep GITHUB_TOKEN --keep AWS_ROLE --keep AWS_REGION --keep AWS_DEFAULT_REGION --keep AWS_ACCESS_KEY_ID --keep AWS_SECRET_ACCESS_KEY --keep AWS_SESSION_TOKEN --keep UPDATECLI_GPGTOKEN --keep UPDATECLI_GITHUB_TOKEN --keep UPDATECLI_GITHUB_ACTOR --keep GPG_SIGNING_KEY --keep NIX_SSL_CERT_FILE --keep NIX_ENV_LOADED --keep TERM --command bash -e {0}
95125
run: |
@@ -104,10 +134,13 @@ jobs:
104134
fetch-depth: 0
105135
- name: install-nix
106136
run: |
107-
curl -L https://nixos.org/nix/install | sh
137+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
138+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
139+
chmod +x nix_install.sh
140+
./nix_install.sh
108141
source /home/runner/.nix-profile/etc/profile.d/nix.sh
109142
nix --version
110-
which nix
143+
rm -f ./nix_install.sh
111144
- name: shell check
112145
shell: /home/runner/.nix-profile/bin/nix develop --ignore-environment --extra-experimental-features nix-command --extra-experimental-features flakes --keep HOME --keep SSH_AUTH_SOCK --keep GITHUB_TOKEN --keep AWS_ROLE --keep AWS_REGION --keep AWS_DEFAULT_REGION --keep AWS_ACCESS_KEY_ID --keep AWS_SECRET_ACCESS_KEY --keep AWS_SESSION_TOKEN --keep UPDATECLI_GPGTOKEN --keep UPDATECLI_GITHUB_TOKEN --keep UPDATECLI_GITHUB_ACTOR --keep GPG_SIGNING_KEY --keep NIX_SSL_CERT_FILE --keep NIX_ENV_LOADED --keep TERM --command bash -e {0}
113146
run: |
@@ -124,10 +157,13 @@ jobs:
124157
fetch-depth: 0 # fetch all history so that we can validate the commit messages
125158
- name: install-nix
126159
run: |
127-
curl -L https://nixos.org/nix/install | sh
160+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
161+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
162+
chmod +x nix_install.sh
163+
./nix_install.sh
128164
source /home/runner/.nix-profile/etc/profile.d/nix.sh
129165
nix --version
130-
which nix
166+
rm -f ./nix_install.sh
131167
- name: Check commit message
132168
shell: /home/runner/.nix-profile/bin/nix develop --ignore-environment --extra-experimental-features nix-command --extra-experimental-features flakes --keep HOME --keep SSH_AUTH_SOCK --keep GITHUB_TOKEN --keep AWS_ROLE --keep AWS_REGION --keep AWS_DEFAULT_REGION --keep AWS_ACCESS_KEY_ID --keep AWS_SECRET_ACCESS_KEY --keep AWS_SESSION_TOKEN --keep UPDATECLI_GPGTOKEN --keep UPDATECLI_GITHUB_TOKEN --keep UPDATECLI_GITHUB_ACTOR --keep GPG_SIGNING_KEY --keep NIX_SSL_CERT_FILE --keep NIX_ENV_LOADED --keep TERM --command bash -e {0}
133169
run: |
@@ -209,10 +245,13 @@ jobs:
209245
fetch-depth: 0
210246
- name: install-nix
211247
run: |
212-
curl -L https://nixos.org/nix/install | sh
248+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
249+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
250+
chmod +x nix_install.sh
251+
./nix_install.sh
213252
source /home/runner/.nix-profile/etc/profile.d/nix.sh
214253
nix --version
215-
which nix
254+
rm -f ./nix_install.sh
216255
- name: Check for secrets
217256
shell: /home/runner/.nix-profile/bin/nix develop --ignore-environment --extra-experimental-features nix-command --extra-experimental-features flakes --keep HOME --keep SSH_AUTH_SOCK --keep GITHUB_TOKEN --keep AWS_ROLE --keep AWS_REGION --keep AWS_DEFAULT_REGION --keep AWS_ACCESS_KEY_ID --keep AWS_SECRET_ACCESS_KEY --keep AWS_SESSION_TOKEN --keep UPDATECLI_GPGTOKEN --keep UPDATECLI_GITHUB_TOKEN --keep UPDATECLI_GITHUB_ACTOR --keep GPG_SIGNING_KEY --keep NIX_SSL_CERT_FILE --keep NIX_ENV_LOADED --keep TERM --command bash -e {0}
218257
run: |

‎.github/workflows/release.yml‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,13 @@ jobs:
165165
- name: install-nix
166166
if: (steps.check-lock.outputs.status == 'clean' && steps.check-ip.outputs.status == 'clean') || strategy.job-index == 0
167167
run: |
168-
curl -L https://nixos.org/nix/install | sh
168+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
169+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
170+
chmod +x nix_install.sh
171+
./nix_install.sh
169172
source /home/runner/.nix-profile/etc/profile.d/nix.sh
170173
nix --version
171-
which nix
174+
rm -f ./nix_install.sh
172175
- name: run-unit-tests
173176
id: run-unit-tests
174177
if: (steps.check-lock.outputs.status == 'clean' && steps.check-ip.outputs.status == 'clean') || strategy.job-index == 0
@@ -258,10 +261,13 @@ jobs:
258261
output-credentials: true
259262
- name: install-nix
260263
run: |
261-
curl -L https://nixos.org/nix/install | sh
264+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
265+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
266+
chmod +x nix_install.sh
267+
./nix_install.sh
262268
source /home/runner/.nix-profile/etc/profile.d/nix.sh
263269
nix --version
264-
which nix
270+
rm -f ./nix_install.sh
265271
- name: cleanup
266272
shell: '/home/runner/.nix-profile/bin/nix develop --ignore-environment --extra-experimental-features nix-command --extra-experimental-features flakes --keep HOME --keep SSH_AUTH_SOCK --keep IDENTIFIER --keep GITHUB_TOKEN --keep GITHUB_OWNER --keep ZONE --keep AWS_ROLE --keep AWS_REGION --keep AWS_DEFAULT_REGION --keep AWS_ACCESS_KEY_ID --keep AWS_SECRET_ACCESS_KEY --keep AWS_SESSION_TOKEN --keep UPDATECLI_GPGTOKEN --keep UPDATECLI_GITHUB_TOKEN --keep UPDATECLI_GITHUB_ACTOR --keep GPG_SIGNING_KEY --keep NIX_SSL_CERT_FILE --keep NIX_ENV_LOADED --keep TERM --command bash -e {0}'
267273
env:
@@ -394,13 +400,13 @@ jobs:
394400
echo "${GPG_KEY}" | gpg --import --batch > /dev/null || { echo "Failed to import GPG key"; exit 1; }
395401
- name: install-nix
396402
run: |
397-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
398-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
399-
chmod +x install.sh
400-
./install.sh
403+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
404+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
405+
chmod +x nix_install.sh
406+
./nix_install.sh
401407
source /home/runner/.nix-profile/etc/profile.d/nix.sh
402408
nix --version
403-
which nix
409+
rm -f ./nix_install.sh
404410
- name: Run GoReleaser
405411
shell: /home/runner/.nix-profile/bin/nix develop --ignore-environment --extra-experimental-features nix-command --extra-experimental-features flakes --keep HOME --keep SSH_AUTH_SOCK --keep GPG_KEY_ID --keep GPG_PASSPHRASE --keep GITHUB_TOKEN --keep NIX_SSL_CERT_FILE --keep NIX_ENV_LOADED --keep TERM --command bash -e {0}
406412
env:
@@ -480,13 +486,13 @@ jobs:
480486
echo "${GPG_KEY}" | gpg --import --batch > /dev/null || { echo "Failed to import GPG key"; exit 1; }
481487
- name: install-nix
482488
run: |
483-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
484-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
485-
chmod +x install.sh
486-
./install.sh
489+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
490+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
491+
chmod +x nix_install.sh
492+
./nix_install.sh
487493
source /home/runner/.nix-profile/etc/profile.d/nix.sh
488494
nix --version
489-
which nix
495+
rm -f ./nix_install.sh
490496
- name: Run GoReleaser
491497
shell: /home/runner/.nix-profile/bin/nix develop --ignore-environment --extra-experimental-features nix-command --extra-experimental-features flakes --keep HOME --keep SSH_AUTH_SOCK --keep GPG_KEY_ID --keep GPG_PASSPHRASE --keep GITHUB_TOKEN --keep NIX_SSL_CERT_FILE --keep NIX_ENV_LOADED --keep TERM --command bash -e {0}
492498
env:

0 commit comments

Comments
 (0)