Skip to content

Commit 70d4e05

Browse files
matttrachmatttrach
authored
fix: clean up nix install script (#2230) (#2235)
Signed-off-by: matttrach <matt.trachier@suse.com>
1 parent e956610 commit 70d4e05

4 files changed

Lines changed: 70 additions & 70 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 & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ jobs:
2828
fetch-depth: 0
2929
- name: install-nix
3030
run: |
31-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
32-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
33-
chmod +x install.sh
34-
./install.sh
31+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
32+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
33+
chmod +x nix_install.sh
34+
./nix_install.sh
3535
source /home/runner/.nix-profile/etc/profile.d/nix.sh
3636
nix --version
37-
which nix
37+
rm -f ./nix_install.sh
3838
- name: Run make test
3939
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}
4040
run: |
@@ -48,13 +48,13 @@ jobs:
4848
fetch-depth: 0
4949
- name: install-nix
5050
run: |
51-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
52-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
53-
chmod +x install.sh
54-
./install.sh
51+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
52+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
53+
chmod +x nix_install.sh
54+
./nix_install.sh
5555
source /home/runner/.nix-profile/etc/profile.d/nix.sh
5656
nix --version
57-
which nix
57+
rm -f ./nix_install.sh
5858
- name: lint terraform
5959
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}
6060
run: |
@@ -70,13 +70,13 @@ jobs:
7070
fetch-depth: 0
7171
- name: install-nix
7272
run: |
73-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
74-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
75-
chmod +x install.sh
76-
./install.sh
73+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
74+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
75+
chmod +x nix_install.sh
76+
./nix_install.sh
7777
source /home/runner/.nix-profile/etc/profile.d/nix.sh
7878
nix --version
79-
which nix
79+
rm -f ./nix_install.sh
8080
- name: action lint
8181
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}
8282
run: actionlint
@@ -90,13 +90,13 @@ jobs:
9090
fetch-depth: 0
9191
- name: install-nix
9292
run: |
93-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
94-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
95-
chmod +x install.sh
96-
./install.sh
93+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
94+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
95+
chmod +x nix_install.sh
96+
./nix_install.sh
9797
source /home/runner/.nix-profile/etc/profile.d/nix.sh
9898
nix --version
99-
which nix
99+
rm -f ./nix_install.sh
100100
- name: check
101101
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}
102102
run: |
@@ -114,13 +114,13 @@ jobs:
114114
fetch-depth: 0
115115
- name: install-nix
116116
run: |
117-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
118-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
119-
chmod +x install.sh
120-
./install.sh
117+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
118+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
119+
chmod +x nix_install.sh
120+
./nix_install.sh
121121
source /home/runner/.nix-profile/etc/profile.d/nix.sh
122122
nix --version
123-
which nix
123+
rm -f ./nix_install.sh
124124
- name: check
125125
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}
126126
run: |
@@ -135,13 +135,13 @@ jobs:
135135
fetch-depth: 0
136136
- name: install-nix
137137
run: |
138-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
139-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
140-
chmod +x install.sh
141-
./install.sh
138+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
139+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
140+
chmod +x nix_install.sh
141+
./nix_install.sh
142142
source /home/runner/.nix-profile/etc/profile.d/nix.sh
143143
nix --version
144-
which nix
144+
rm -f ./nix_install.sh
145145
- name: shell check
146146
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}
147147
run: |
@@ -158,13 +158,13 @@ jobs:
158158
fetch-depth: 0
159159
- name: install-nix
160160
run: |
161-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
162-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
163-
chmod +x install.sh
164-
./install.sh
161+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
162+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
163+
chmod +x nix_install.sh
164+
./nix_install.sh
165165
source /home/runner/.nix-profile/etc/profile.d/nix.sh
166166
nix --version
167-
which nix
167+
rm -f ./nix_install.sh
168168
- name: Check commit message
169169
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}
170170
run: |
@@ -247,13 +247,13 @@ jobs:
247247
fetch-depth: 0
248248
- name: install-nix
249249
run: |
250-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
251-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
252-
chmod +x install.sh
253-
./install.sh
250+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
251+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
252+
chmod +x nix_install.sh
253+
./nix_install.sh
254254
source /home/runner/.nix-profile/etc/profile.d/nix.sh
255255
nix --version
256-
which nix
256+
rm -f ./nix_install.sh
257257
- name: Check for secrets
258258
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}
259259
run: |

‎.github/workflows/release.yml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,13 @@ jobs:
171171
- name: install-nix
172172
if: (steps.check-lock.outputs.status == 'clean' && steps.check-ip.outputs.status == 'clean') || strategy.job-index == 0
173173
run: |
174-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
175-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
176-
chmod +x install.sh
177-
./install.sh
174+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
175+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
176+
chmod +x nix_install.sh
177+
./nix_install.sh
178178
source /home/runner/.nix-profile/etc/profile.d/nix.sh
179179
nix --version
180-
which nix
180+
rm -f ./nix_install.sh
181181
- name: run-unit-tests
182182
id: run-unit-tests
183183
if: (steps.check-lock.outputs.status == 'clean' && steps.check-ip.outputs.status == 'clean') || strategy.job-index == 0
@@ -267,13 +267,13 @@ jobs:
267267
output-credentials: true
268268
- name: install-nix
269269
run: |
270-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
271-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
272-
chmod +x install.sh
273-
./install.sh
270+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
271+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
272+
chmod +x nix_install.sh
273+
./nix_install.sh
274274
source /home/runner/.nix-profile/etc/profile.d/nix.sh
275275
nix --version
276-
which nix
276+
rm -f ./nix_install.sh
277277
- name: cleanup
278278
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}'
279279
env:
@@ -410,13 +410,13 @@ jobs:
410410
echo "${GPG_KEY}" | gpg --import --batch > /dev/null || { echo "Failed to import GPG key"; exit 1; }
411411
- name: install-nix
412412
run: |
413-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
414-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
415-
chmod +x install.sh
416-
./install.sh
413+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
414+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
415+
chmod +x nix_install.sh
416+
./nix_install.sh
417417
source /home/runner/.nix-profile/etc/profile.d/nix.sh
418418
nix --version
419-
which nix
419+
rm -f ./nix_install.sh
420420
- name: Run GoReleaser
421421
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}
422422
env:
@@ -494,13 +494,13 @@ jobs:
494494
echo "${GPG_KEY}" | gpg --import --batch > /dev/null || { echo "Failed to import GPG key"; exit 1; }
495495
- name: install-nix
496496
run: |
497-
curl -L -o install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
498-
echo "${NIX_INSTALL_SHA} install.sh" | sha256sum -c -
499-
chmod +x install.sh
500-
./install.sh
497+
curl -L -o nix_install.sh "https://releases.nixos.org/nix/nix-${NIX_INSTALL_VERSION}/install"
498+
echo "${NIX_INSTALL_SHA} nix_install.sh" | sha256sum -c -
499+
chmod +x nix_install.sh
500+
./nix_install.sh
501501
source /home/runner/.nix-profile/etc/profile.d/nix.sh
502502
nix --version
503-
which nix
503+
rm -f ./nix_install.sh
504504
- name: Run GoReleaser
505505
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}
506506
env:

0 commit comments

Comments
 (0)