Skip to content

Commit 34b717e

Browse files
matttrachmatttrach
authored
fix: clean up nix install script (#2230) (#2236)
Signed-off-by: matttrach <matt.trachier@suse.com>
1 parent 77fb715 commit 34b717e

4 files changed

Lines changed: 70 additions & 40 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: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,13 @@ jobs:
2626
fetch-depth: 0
2727
- name: install-nix
2828
run: |
29-
curl -L https://nixos.org/nix/install | sh
29+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
30+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
31+
chmod +x nix_install.sh
32+
./nix_install.sh
3033
source /home/runner/.nix-profile/etc/profile.d/nix.sh
3134
nix --version
32-
which nix
35+
rm -f ./nix_install.sh
3336
- name: Run make test
3437
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}
3538
run: |
@@ -43,10 +46,13 @@ jobs:
4346
fetch-depth: 0
4447
- name: install-nix
4548
run: |
46-
curl -L https://nixos.org/nix/install | sh
49+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
50+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
51+
chmod +x nix_install.sh
52+
./nix_install.sh
4753
source /home/runner/.nix-profile/etc/profile.d/nix.sh
4854
nix --version
49-
which nix
55+
rm -f ./nix_install.sh
5056
- name: lint terraform
5157
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}
5258
run: |
@@ -62,10 +68,13 @@ jobs:
6268
fetch-depth: 0
6369
- name: install-nix
6470
run: |
65-
curl -L https://nixos.org/nix/install | sh
71+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
72+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
73+
chmod +x nix_install.sh
74+
./nix_install.sh
6675
source /home/runner/.nix-profile/etc/profile.d/nix.sh
6776
nix --version
68-
which nix
77+
rm -f ./nix_install.sh
6978
- name: action lint
7079
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}
7180
run: actionlint
@@ -79,10 +88,13 @@ jobs:
7988
fetch-depth: 0
8089
- name: install-nix
8190
run: |
82-
curl -L https://nixos.org/nix/install | sh
91+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
92+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
93+
chmod +x nix_install.sh
94+
./nix_install.sh
8395
source /home/runner/.nix-profile/etc/profile.d/nix.sh
8496
nix --version
85-
which nix
97+
rm -f ./nix_install.sh
8698
- name: check
8799
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}
88100
run: |
@@ -100,10 +112,13 @@ jobs:
100112
fetch-depth: 0
101113
- name: install-nix
102114
run: |
103-
curl -L https://nixos.org/nix/install | sh
115+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
116+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
117+
chmod +x nix_install.sh
118+
./nix_install.sh
104119
source /home/runner/.nix-profile/etc/profile.d/nix.sh
105120
nix --version
106-
which nix
121+
rm -f ./nix_install.sh
107122
- name: check
108123
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}
109124
run: |
@@ -118,10 +133,13 @@ jobs:
118133
fetch-depth: 0
119134
- name: install-nix
120135
run: |
121-
curl -L https://nixos.org/nix/install | sh
136+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
137+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
138+
chmod +x nix_install.sh
139+
./nix_install.sh
122140
source /home/runner/.nix-profile/etc/profile.d/nix.sh
123141
nix --version
124-
which nix
142+
rm -f ./nix_install.sh
125143
- name: shell check
126144
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}
127145
run: |
@@ -138,10 +156,13 @@ jobs:
138156
fetch-depth: 0
139157
- name: install-nix
140158
run: |
141-
curl -L https://nixos.org/nix/install | sh
159+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
160+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
161+
chmod +x nix_install.sh
162+
./nix_install.sh
142163
source /home/runner/.nix-profile/etc/profile.d/nix.sh
143164
nix --version
144-
which nix
165+
rm -f ./nix_install.sh
145166
- name: Check commit message
146167
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}
147168
run: |
@@ -224,10 +245,13 @@ jobs:
224245
fetch-depth: 0
225246
- name: install-nix
226247
run: |
227-
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
228252
source /home/runner/.nix-profile/etc/profile.d/nix.sh
229253
nix --version
230-
which nix
254+
rm -f ./nix_install.sh
231255
- name: Check for secrets
232256
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}
233257
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:
@@ -398,13 +404,13 @@ jobs:
398404
echo "${GPG_KEY}" | gpg --import --batch > /dev/null || { echo "Failed to import GPG key"; exit 1; }
399405
- name: install-nix
400406
run: |
401-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
402-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
403-
chmod +x install.sh
404-
./install.sh
407+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
408+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
409+
chmod +x nix_install.sh
410+
./nix_install.sh
405411
source /home/runner/.nix-profile/etc/profile.d/nix.sh
406412
nix --version
407-
which nix
413+
rm -f ./nix_install.sh
408414
- name: Run GoReleaser
409415
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}
410416
env:
@@ -482,13 +488,13 @@ jobs:
482488
echo "${GPG_KEY}" | gpg --import --batch > /dev/null || { echo "Failed to import GPG key"; exit 1; }
483489
- name: install-nix
484490
run: |
485-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
486-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
487-
chmod +x install.sh
488-
./install.sh
491+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
492+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
493+
chmod +x nix_install.sh
494+
./nix_install.sh
489495
source /home/runner/.nix-profile/etc/profile.d/nix.sh
490496
nix --version
491-
which nix
497+
rm -f ./nix_install.sh
492498
- name: Run GoReleaser
493499
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}
494500
env:

0 commit comments

Comments
 (0)