misc: Properly clean up wget artefacts during install

whisperity · May 29, 2024 · dafb1c9 · dafb1c9
1 parent 63f2a47
commit dafb1c9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/.dockerignore b/.dockerignore
@@ -1,5 +1,6 @@
 .git
 .github
+docker-compose.yml
 LICENSE
 README.md
 SECURITY.md
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -63,7 +63,7 @@ jobs:
             --jobs $(nproc) \
             -- \
             bash -c \
-              "ps fauxw; /usr/bin/ls -alh .; /usr/bin/ls -alh /var/log; cat /var/log/*; exit;"
+              "set -x; ps fauxw; /usr/bin/ls -alh .; /usr/bin/ls -alh /var/log; cat /var/log/*; exit;"
       - name: "Log in to GitHub Container Registry (GHCR)"
         if: "github.ref == 'refs/heads/master' && github.event_name == 'workflow_dispatch' && inputs.release"
         uses: "docker/login-action@v3"

diff --git a/usr/local/sbin/install-compilers.sh b/usr/local/sbin/install-compilers.sh
@@ -42,6 +42,7 @@ if [[ "$OS_RELEASE" == "focal" ]]; then
   wget -O- https://apt.llvm.org/llvm-snapshot.gpg.key \
     | gpg --dearmor \
     > "/etc/apt/keyrings/llvm-snapshot.gpg"
+  rm -fv "$HOME/.wget-hsts"
   echo "deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg]" \
     "http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" \
     > "/etc/apt/sources.list.d/apt-llvm-org-focal-llvm-toolchain-focal-14.list"