diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 75d319b09f..514032ec92 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -114,22 +114,22 @@ jobs: - build_target: linux64 host: x86_64-pc-linux-gnu depends_on: linux64 - - build_target: linux64_tsan - host: x86_64-pc-linux-gnu - depends_on: linux64 - - build_target: linux64_ubsan + - build_target: linux64_cxx20 host: x86_64-pc-linux-gnu depends_on: linux64 - build_target: linux64_fuzz host: x86_64-pc-linux-gnu depends_on: linux64 - - build_target: linux64_cxx20 + - build_target: linux64_nowallet host: x86_64-pc-linux-gnu depends_on: linux64 - build_target: linux64_sqlite host: x86_64-pc-linux-gnu depends_on: linux64 - - build_target: linux64_nowallet + - build_target: linux64_tsan + host: x86_64-pc-linux-gnu + depends_on: linux64 + - build_target: linux64_ubsan host: x86_64-pc-linux-gnu depends_on: linux64 container: diff --git a/ci/dash/matrix.sh b/ci/dash/matrix.sh index 82a9233df1..6eeb2a7565 100755 --- a/ci/dash/matrix.sh +++ b/ci/dash/matrix.sh @@ -18,28 +18,28 @@ export UBSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/ if [ "$BUILD_TARGET" = "arm-linux" ]; then source ./ci/test/00_setup_env_arm.sh -elif [ "$BUILD_TARGET" = "win64" ]; then - source ./ci/test/00_setup_env_win64.sh elif [ "$BUILD_TARGET" = "linux64" ]; then source ./ci/test/00_setup_env_native_qt5.sh elif [ "$BUILD_TARGET" = "linux64_asan" ]; then source ./ci/test/00_setup_env_native_asan.sh +elif [ "$BUILD_TARGET" = "linux64_cxx20" ]; then + source ./ci/test/00_setup_env_native_cxx20.sh +elif [ "$BUILD_TARGET" = "linux64_fuzz" ]; then + source ./ci/test/00_setup_env_native_fuzz.sh +elif [ "$BUILD_TARGET" = "linux64_nowallet" ]; then + source ./ci/test/00_setup_env_native_nowallet.sh +elif [ "$BUILD_TARGET" = "linux64_sqlite" ]; then + source ./ci/test/00_setup_env_native_sqlite.sh elif [ "$BUILD_TARGET" = "linux64_tsan" ]; then source ./ci/test/00_setup_env_native_tsan.sh elif [ "$BUILD_TARGET" = "linux64_ubsan" ]; then source ./ci/test/00_setup_env_native_ubsan.sh -elif [ "$BUILD_TARGET" = "linux64_fuzz" ]; then - source ./ci/test/00_setup_env_native_fuzz.sh -elif [ "$BUILD_TARGET" = "linux64_cxx20" ]; then - source ./ci/test/00_setup_env_native_cxx20.sh -elif [ "$BUILD_TARGET" = "linux64_sqlite" ]; then - source ./ci/test/00_setup_env_native_sqlite.sh -elif [ "$BUILD_TARGET" = "linux64_nowallet" ]; then - source ./ci/test/00_setup_env_native_nowallet.sh elif [ "$BUILD_TARGET" = "linux64_valgrind" ]; then source ./ci/test/00_setup_env_native_valgrind.sh elif [ "$BUILD_TARGET" = "mac" ]; then source ./ci/test/00_setup_env_mac.sh elif [ "$BUILD_TARGET" = "s390x" ]; then source ./ci/test/00_setup_env_s390x.sh +elif [ "$BUILD_TARGET" = "win64" ]; then + source ./ci/test/00_setup_env_win64.sh fi