diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2019-10-29 17:01:53 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2019-11-15 06:53:41 +1000 |
| commit | 5c39aeceaa95b8dd5bfc1ffcb9782461c9defb49 (patch) | |
| tree | fc608e01a97cc5fce485759940cc378c5d0af14d /.gitlab-ci.yml | |
| parent | 699eb1bca5ac7a1059be819d1169f05241bdf5dc (diff) | |
| download | xkeyboard-config-5c39aeceaa95b8dd5bfc1ffcb9782461c9defb49.tar.gz | |
gitlab CI: don't use $HOME in the instdir, it's unset
Let's use CI_PROJECT_DIR which resolves to the root of the checked-out git
directory, i.e. the $PWD for the scripts we use. We can't really use anything
else as install dir because if we want to cache the artifacts (future patch)
they have to be within this directory somewhere.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d46093..36e2f27 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ variables: ARCH_PKGS: 'xorg-util-macros autoconf automake make gettext pkg-config gcc grep m4 python' BUILDDIR: '_build' - INSTDIR: '$HOME/_inst' + INSTDIR: '$CI_PROJECT_DIR/_inst' CONFIGURE_ARGS: '' MAKE_EXTRA_ARG: '' @@ -24,7 +24,7 @@ variables: - mkdir -p "$INSTDIR" - autoreconf -ivf - pushd "$BUILDDIR" - - ../configure --prefix="$PWD/../$INSTDIR" --disable-silent-rules --disable-runtime-deps "$CONFIGURE_ARGS" + - ../configure --prefix="$INSTDIR" --disable-silent-rules --disable-runtime-deps "$CONFIGURE_ARGS" - make - if test x"$MAKE_EXTRA_COMMAND" != "x"; then make $MAKE_EXTRA_COMMAND; fi |