Skip to content

Commit 8b85b22

Browse files
committed
Changes to get things working on windows properly
1 parent e494bf6 commit 8b85b22

File tree

4 files changed

+17
-16
lines changed

4 files changed

+17
-16
lines changed

.buildkite/instantiate_and_test.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
#set -euo pipefail
3+
4+
echo "+++ DEBUG"
5+
echo "PATH=$PATH"
6+
ls -la /c/buildkite-agent
7+
8+
julia --project=test -e 'import Pkg; Pkg.instantiate()'
9+
echo '+++ runtests.jl'
10+
julia --project=test test/runtests.jl

.buildkite/test_linux.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@ steps:
1313
- "/cache:/cache"
1414
- staticfloat/metahook#sf/windows_backslashes:
1515
pre-command: |
16-
# Upgrade our debian package to bullseye (wowza)
17-
if [[ "${ARCH?}" == "x86_64" ]] || [[ "${ARCH?}" == "aarch64" ]]; then
16+
# Upgrade our debian package to bullseye (wowza) and get an ILP64 blas
17+
if [[ "${ARCH?}" == *64 ]]; then
1818
echo "deb http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
1919
apt update && apt install -y libblas64-dev liblapack64-dev
2020
fi
21-
commands: |
22-
julia --project=test -e 'import Pkg; Pkg.instantiate()'
23-
echo "+++ run tests"
24-
julia --project=test test/runtests.jl
21+
command: "bash .buildkite/instantiate_and_test.sh"
2522
agents:
2623
queue: "juliaecosystem"
2724
os: "linux"

.buildkite/test_macos.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ steps:
66
- staticfloat/metahook#sf/windows_backslashes:
77
pre-command: |
88
echo "This is a test"
9-
commands: |
10-
julia --project=test -e 'import Pkg; Pkg.instantiate()'
11-
echo "+++ run tests"
12-
julia --project=test test/runtests.jl
9+
command: "bash .buildkite/instantiate_and_test.sh"
1310
agents:
1411
queue: "juliaecosystem"
1512
os: "macos"

.buildkite/test_windows.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,15 @@ steps:
66
- staticfloat/metahook#sf/windows_backslashes:
77
# Copy our julia installation to a known location that we can mount with docker
88
pre-command: |
9-
cp $(dirname $(dirname $(which julia))) /c/buildkite-agent
9+
cp -r $(dirname $(dirname $(which julia)))/* /c/buildkite-agent
1010
- docker#v3.13.0:
1111
image: "${DOCKER_IMAGE?}"
1212
always-pull: true
1313
volumes:
1414
# Abuse the fact that we have a `PATH` mapping for `buildkite-agent`
1515
# to mount in our build of Julia for use within the container:
16-
- "C:\\buildkite-agent\\bin:C:\\buildkite-agent\\bin"
17-
commands: |
18-
julia --project=test -e 'import Pkg; Pkg.instantiate()'
19-
echo "+++ run tests"
20-
julia --project=test test/runtests.jl
16+
- "C:\\buildkite-agent:C:\\buildkite-agent"
17+
command: ["bash", "-c", ".buildkite/instantiate_and_test.sh"]
2118
agents:
2219
queue: "juliaecosystem"
2320
os: "windows"

0 commit comments

Comments
 (0)