Unify placement of set -e and set -x

Windows-on-ARM-Experiments · Nov 20, 2023 · f4eeb7b · f4eeb7b
1 parent 16d9552
commit f4eeb7b
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 18 deletions.
diff --git a/.github/scripts/build-binutils.sh b/.github/scripts/build-binutils.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+set -e # exit on error
+set -x # echo on
+
 BINUTILS_VERSION=${BINUTILS_VERSION:-binutils-master}
 
 TARGET=${TARGET:-aarch64-w64-mingw32}
@@ -9,9 +12,6 @@ INSTALL_PATH=${INSTALL_PATH:-~/cross}
 
 export PATH=$INSTALL_PATH/bin:$PATH
 
-set -e # exit on error
-set -x # echo on
-
 mkdir -p $BUILD_PATH/binutils
 cd $BUILD_PATH/binutils
 

diff --git a/.github/scripts/build-gcc-libs.sh b/.github/scripts/build-gcc-libs.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+set -e # exit on error
+set -x # echo on
+
 TARGET=${TARGET:-aarch64-w64-mingw32}
 BUILD_PATH=${BUILD_PATH:-$PWD/build-$TARGET}
 BUILD_MAKE_OPTIONS=-j$(nproc)

diff --git a/.github/scripts/build-gcc.sh b/.github/scripts/build-gcc.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+set -e # exit on error
+set -x # echo on
+
 GCC_VERSION=${GCC_VERSION:-gcc-master}
 
 TARGET=${TARGET:-aarch64-w64-mingw32}
@@ -9,9 +12,6 @@ INSTALL_PATH=${INSTALL_PATH:-~/cross}
 
 export PATH=$INSTALL_PATH/bin:$PATH
 
-set -e # exit on error
-set -x # echo on
-
 mkdir -p $BUILD_PATH/gcc
 
 cd $BUILD_PATH/gcc

diff --git a/.github/scripts/build-libgcc.sh b/.github/scripts/build-libgcc.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+set -e # exit on error
+set -x # echo on
+
 TARGET=${TARGET:-aarch64-w64-mingw32}
 BUILD_PATH=${BUILD_PATH:-$PWD/build-$TARGET}
 BUILD_MAKE_OPTIONS=-j$(nproc)

diff --git a/.github/scripts/build-mingw-crt.sh b/.github/scripts/build-mingw-crt.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+set -e # exit on error
+set -x # echo on
+
 MINGW_VERSION=${MINGW_VERSION:-mingw-w64-master}
 
 TARGET=${TARGET:-aarch64-w64-mingw32}
@@ -28,9 +31,6 @@ esac
 
 export PATH=$INSTALL_PATH/bin:$PATH
 
-set -e # exit on error
-set -x # echo on
-
 mkdir -p $BUILD_PATH/mingw
 cd $BUILD_PATH/mingw
 

diff --git a/.github/scripts/build-mingw-headers.sh b/.github/scripts/build-mingw-headers.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+set -e # exit on error
+set -x # echo on
+
 MINGW_VERSION=${MINGW_VERSION:-mingw-w64-master}
 
 TARGET=${TARGET:-aarch64-w64-mingw32}
@@ -19,9 +22,6 @@ esac
 
 export PATH=$INSTALL_PATH/bin:$PATH
 
-set -e # exit on error
-set -x # echo on
-
 mkdir -p $BUILD_PATH/mingw-headers
 cd $BUILD_PATH/mingw-headers
 

diff --git a/.github/scripts/build-mingw.sh b/.github/scripts/build-mingw.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+set -e # exit on error
+set -x # echo on
+
 MINGW_VERSION=${MINGW_VERSION:-mingw-w64-master}
 
 TARGET=${TARGET:-aarch64-w64-mingw32}
@@ -28,9 +31,6 @@ esac
 
 export PATH=$INSTALL_PATH/bin:$PATH
 
-set -e # exit on error
-set -x # echo on
-
 cd $BUILD_PATH/mingw
 
 echo "::group::Configure MinGW libraries"

diff --git a/.github/scripts/install-libraries.sh b/.github/scripts/install-libraries.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+set -e # exit on error
+set -x # echo on
+
 BINUTILS_VERSION=${BINUTILS_VERSION:-binutils-master}
 GCC_VERSION=${GCC_VERSION:-gcc-master}
 
@@ -10,9 +13,6 @@ MPC_VERSION=mpc-1.2.1
 ISL_VERSION=isl-0.24
 WGET_OPTIONS="-nc -P downloads"
 
-set -e # exit on error
-set -x # echo on
-
 echo "::group::Install libraries"
 
 # Download packages