Use set -x for shell scripts

stepchowfun · Mar 13, 2024 · 0567c00 · 0567c00
1 parent bba67a1
commit 0567c00
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,8 +25,8 @@ jobs:
         read_remote_cache: true
         write_remote_cache: ${{ github.event_name == 'push' }}
     - run: |
-        # Make Bash not silently ignore errors.
-        set -euo pipefail
+        # Make Bash log commands and not silently ignore errors.
+        set -euxo pipefail
 
         # The artifact name will contain the target triple, so the file name doesn't need to.
         mv artifacts/docuum-x86_64-unknown-linux-gnu artifacts/docuum
@@ -36,8 +36,8 @@ jobs:
         path: artifacts/docuum
         if-no-files-found: error
     - run: |
-        # Make Bash not silently ignore errors.
-        set -euo pipefail
+        # Make Bash log commands and not silently ignore errors.
+        set -euxo pipefail
 
         # The artifact name will contain the target triple, so the file name doesn't need to.
         mv artifacts/docuum-x86_64-unknown-linux-musl artifacts/docuum
@@ -47,8 +47,8 @@ jobs:
         path: artifacts/docuum
         if-no-files-found: error
     - run: |
-        # Make Bash not silently ignore errors.
-        set -euo pipefail
+        # Make Bash log commands and not silently ignore errors.
+        set -euxo pipefail
 
         # The artifact name will contain the target triple, so the file name doesn't need to.
         mv artifacts/docuum-aarch64-unknown-linux-gnu artifacts/docuum
@@ -58,8 +58,8 @@ jobs:
         path: artifacts/docuum
         if-no-files-found: error
     - run: |
-        # Make Bash not silently ignore errors.
-        set -euo pipefail
+        # Make Bash log commands and not silently ignore errors.
+        set -euxo pipefail
 
         # The artifact name will contain the target triple, so the file name doesn't need to.
         mv artifacts/docuum-aarch64-unknown-linux-musl artifacts/docuum
@@ -73,16 +73,16 @@ jobs:
     runs-on: windows-latest
     steps:
     - run: |
-        # Make Bash not silently ignore errors.
-        set -euo pipefail
+        # Make Bash log commands and not silently ignore errors.
+        set -euxo pipefail
 
         # The unit tests do not expect the files in `test_data` to have carriage returns added.
         git config --global core.autocrlf false
         git config --global core.eol lf
     - uses: actions/checkout@v3
     - run: |
-        # Make Bash not silently ignore errors.
-        set -euo pipefail
+        # Make Bash log commands and not silently ignore errors.
+        set -euxo pipefail
 
         # Install the appropriate version of Rust.
         rustup toolchain install 1.76.0 # [ref:rust_1.76.0]
@@ -121,8 +121,8 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - run: |
-        # Make Bash not silently ignore errors.
-        set -euo pipefail
+        # Make Bash log commands and not silently ignore errors.
+        set -euxo pipefail
 
         # Install the appropriate version of Rust.
         rustup toolchain install 1.76.0 # [ref:rust_1.76.0]
@@ -159,8 +159,8 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - run: |
-        # Make Bash not silently ignore errors.
-        set -euo pipefail
+        # Make Bash log commands and not silently ignore errors.
+        set -euxo pipefail
 
         # Run the installer script.
         PREFIX=/tmp ./install.sh
@@ -173,8 +173,8 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - run: |
-        # Make Bash not silently ignore errors.
-        set -euo pipefail
+        # Make Bash log commands and not silently ignore errors.
+        set -euxo pipefail
 
         # Run the installer script.
         PREFIX=/tmp ./install.sh
@@ -200,8 +200,8 @@ jobs:
     - env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        # Make Bash not silently ignore errors.
-        set -euo pipefail
+        # Make Bash log commands and not silently ignore errors.
+        set -euxo pipefail
 
         # Install the appropriate version of Rust.
         rustup toolchain install 1.76.0 # [ref:rust_1.76.0]
@@ -258,8 +258,8 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        # Make Bash not silently ignore errors.
-        set -euo pipefail
+        # Make Bash log commands and not silently ignore errors.
+        set -euxo pipefail
 
         # Run the Docker image to validate it. The image has already been published (since the
         # `docker/build-push-action@v5` action unfortunately doesn't support importing multi-

diff --git a/integration-test.sh b/integration-test.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -euo pipefail
+set -euxo pipefail
 
 # See [ref:integration_test_step] for how to run this integration test.
 

diff --git a/toast.yml b/toast.yml
@@ -2,8 +2,8 @@ image: ubuntu:22.04
 default: build
 user: user
 command_prefix: |
-  # Make Bash not silently ignore errors.
-  set -euo pipefail
+  # Make Bash log commands and not silently ignore errors.
+  set -euxo pipefail
 
   # Load the Rust startup file, if it exists.
   if [ -f "$HOME/.cargo/env" ]; then