aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2020-04-04 21:52:51 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2020-04-05 22:54:29 +0300
commit7896d945ff910ca90ab6a662256ecdcbc72623f5 (patch)
tree543220cd16b887dbc749ec0f7df208afde4ae0c2 /ci
parentd20529784e3f089ef9f813818f8df10a88c1364d (diff)
downloadmeson-7896d945ff910ca90ab6a662256ecdcbc72623f5.zip
meson-7896d945ff910ca90ab6a662256ecdcbc72623f5.tar.gz
meson-7896d945ff910ca90ab6a662256ecdcbc72623f5.tar.bz2
ci: Fix env_vars.sh path in the opensuse image
Diffstat (limited to 'ci')
-rwxr-xr-xci/ciimage/opensuse/install.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/ci/ciimage/opensuse/install.sh b/ci/ciimage/opensuse/install.sh
index 5e35ef7..c5dd6df 100755
--- a/ci/ciimage/opensuse/install.sh
+++ b/ci/ciimage/opensuse/install.sh
@@ -28,15 +28,15 @@ zypper --non-interactive update
zypper install -y "${pkgs[@]}"
python3 -m pip install hotdoc gobject PyGObject
-echo 'export PKG_CONFIG_PATH="/usr/lib64/mpi/gcc/openmpi3/lib64/pkgconfig:$PKG_CONFIG_PATH"' >> /env_vars.sh
+echo 'export PKG_CONFIG_PATH="/usr/lib64/mpi/gcc/openmpi3/lib64/pkgconfig:$PKG_CONFIG_PATH"' >> /ci/env_vars.sh
# dmd is very special on OpenSUSE (as in the packages do not work)
# see https://bugzilla.opensuse.org/show_bug.cgi?id=1162408
curl -fsS https://dlang.org/install.sh | bash -s dmd | tee dmd_out.txt
-cat dmd_out.txt | grep source | sed 's/^[^`]*`//g' | sed 's/`.*//g' >> /env_vars.sh
-chmod +x /env_vars.sh
+cat dmd_out.txt | grep source | sed 's/^[^`]*`//g' | sed 's/`.*//g' >> /ci/env_vars.sh
+chmod +x /ci/env_vars.sh
-source /env_vars.sh
+source /ci/env_vars.sh
dub_fetch urld
dub build urld --compiler=dmd