diff options
| author | Arnstein Ressem <aressem@vespa.ai> | 2024-05-22 00:04:32 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@vespa.ai> | 2024-05-22 00:04:32 +0200 |
| commit | f7eed9d1b57b4091b1d3b1f5d24efb2c03282377 (patch) | |
| tree | 9bca132679becf48c2b4dba2e3ba9246d25aeac8 /.buildkite | |
| parent | 656362675b248edaecfb12baec704bea384de451 (diff) | |
Source gcc toolset and fix dir creation.
Diffstat (limited to '.buildkite')
| -rwxr-xr-x | .buildkite/cpp.sh | 2 | ||||
| -rwxr-xr-x | .buildkite/java.sh | 2 | ||||
| -rwxr-xr-x | .buildkite/prepare.sh | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/.buildkite/cpp.sh b/.buildkite/cpp.sh index 520303d0e37..1403bb916b1 100755 --- a/.buildkite/cpp.sh +++ b/.buildkite/cpp.sh @@ -2,5 +2,7 @@ set -euo pipefail +source /etc/profile.d/enable-gcc-toolset.sh + cd "$SOURCE_DIR" make -j "$NUM_CPP_THREADS" diff --git a/.buildkite/java.sh b/.buildkite/java.sh index 0a4da0facf5..bc23533c56d 100755 --- a/.buildkite/java.sh +++ b/.buildkite/java.sh @@ -2,6 +2,8 @@ set -euo pipefail +source /etc/profile.d/enable-gcc-toolset.sh + cd "$SOURCE_DIR" read -ra MVN_EXTRA_OPTS <<< "$VESPA_MAVEN_EXTRA_OPTS" diff --git a/.buildkite/prepare.sh b/.buildkite/prepare.sh index 14ce79e9e7a..6989c2fc568 100755 --- a/.buildkite/prepare.sh +++ b/.buildkite/prepare.sh @@ -4,4 +4,5 @@ set -euo pipefail "$SOURCE_DIR/screwdriver/replace-vespa-version-in-poms.sh" "$VESPA_VERSION" "$SOURCE_DIR" -mkdir -p "$WORKDIR/artifacts/$ARCH/{rpms,maven-repo}" +mkdir -p "$WORKDIR/artifacts/$ARCH/rpms" +mkdir -p "$WORKDIR/artifacts/$ARCH/maven-repo" |