Run Bash in safe mode by default on CI (#313)

Co-authored-by: Hidde Moll <hidde@qbaylogic.com>
clash-lang · Jun 23, 2023 · 478f300 · 478f300
1 parent e64c56e
commit 478f300
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/.github/docker/Dockerfile b/.github/docker/Dockerfile
@@ -37,6 +37,6 @@ RUN \
   nix-shell -j32 --run "echo OK"
 
 RUN \
-  echo '#!/usr/bin/env bash'                                                >> /usr/bin/git-nix-shell && \
-  echo 'nix-shell "${GITHUB_WORKSPACE}/shell.nix" "${@:2}" --run "bash $1"' >> /usr/bin/git-nix-shell && \
+  echo '#!/usr/bin/env bash'                                                                 >> /usr/bin/git-nix-shell && \
+  echo 'nix-shell "${GITHUB_WORKSPACE}/shell.nix" "${@:2}" --run "bash -euf -o pipefail $1"' >> /usr/bin/git-nix-shell && \
   chmod +x /usr/bin/git-nix-shell
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -80,7 +80,7 @@ jobs:
         shell: git-nix-shell {0} --pure
 
     container:
-      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-22
+      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-23
 
     steps:
       - name: Checkout
@@ -116,7 +116,7 @@ jobs:
         shell: git-nix-shell {0} --pure --keep "GITHUB_OUTPUT"
 
     container:
-      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-22
+      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-23
 
     steps:
       - name: Checkout
@@ -155,7 +155,7 @@ jobs:
       fail-fast: false
 
     container:
-      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-22
+      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-23
 
     steps:
       - name: Checkout
@@ -223,7 +223,7 @@ jobs:
     needs: [build, lint, elastic-buffer-sim-topologies-matrix, elastic-buffer-sim-topologies]
 
     container:
-      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-22
+      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-23
 
     steps:
       - name: Download simulation artifacts
@@ -242,6 +242,7 @@ jobs:
       - name: Generate final report
         shell: git-nix-shell {0} --pure
         run: |
+          set +f # Enable globbing
           pdfunite artifacts/*/report.pdf report.pdf
 
       - name: Upload report
@@ -260,7 +261,7 @@ jobs:
     needs: [build, lint]
 
     container:
-      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-22
+      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-23
 
     steps:
       - name: Checkout
@@ -298,7 +299,7 @@ jobs:
     needs: [build, lint]
 
     container:
-      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-22
+      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-23
 
     steps:
       - name: Checkout
@@ -344,7 +345,7 @@ jobs:
       run:
         shell: git-nix-shell {0} --pure
     container:
-      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-22
+      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-23
 
     steps:
       - name: Checkout
@@ -375,7 +376,7 @@ jobs:
       run:
         shell: git-nix-shell {0} --pure
     container:
-      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-22
+      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-23
     needs: [build]
 
     steps:
@@ -427,7 +428,7 @@ jobs:
       run:
         shell: git-nix-shell {0} --pure
     container:
-      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-22
+      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-23
 
     steps:
       - name: Checkout
@@ -457,7 +458,7 @@ jobs:
       run:
         shell: git-nix-shell {0} --pure
     container:
-      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-22
+      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-23
 
     steps:
       - name: Checkout
@@ -496,7 +497,7 @@ jobs:
     needs: [build, lint]
 
     container:
-      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-22
+      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-23
 
     steps:
       - name: Checkout
@@ -534,7 +535,7 @@ jobs:
     needs: [build, lint]
 
     container:
-      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-22
+      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-23
 
     steps:
       - name: Checkout
@@ -567,7 +568,7 @@ jobs:
     name: bittide-instances synthesis matrix generation
     runs-on: [self-hosted, compute]
     container:
-      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-22
+      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-23
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -606,7 +607,7 @@ jobs:
       fail-fast: false
 
     container:
-      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-22
+      image: ghcr.io/clash-lang/nixos-bittide-hardware:2023-06-23
       volumes:
         - /opt/tools:/opt/tools
       options: --mac-address="6c:5a:b0:6c:13:0b"