diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2022-03-08 19:17:58 +0100 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2022-03-09 23:01:49 +0100 |
| commit | 74eb744355b757e37c8d0fb6efacb825c6123d5b (patch) | |
| tree | 019457520ac625e3ba9f2c24bb3ed9f9cad933d6 /.gitlab-ci.yml | |
| parent | 01f640ab3a4e4706032f2a3a8b769005b62069af (diff) | |
Distinguish between local and dependency targets to prevent confusion.
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a844f50..2803d10 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,10 @@ cache: key: toolchain paths: - w64-mingw32-sysroot/ + - EASTL-build/libEASTL.a + - EASTL-native-build/libEASTL.a + - CRT/*.o + - CRT/*.opp before_script: - export DEBIAN_FRONTEND=noninteractive @@ -23,8 +27,11 @@ makedeps: - pwd - > { test -x w64-mingw32-sysroot/x86_64/bin/x86_64-w64-mingw32-gcc && \ - test -x w64-mingw32-sysroot/x86_64/bin/x86_64-w64-mingw32-g++; } || \ - { make -C . -f Makefile.deps -j "${BUILDJOBS:-4}" || { cat bld/build.log; false; }; } + test -x w64-mingw32-sysroot/x86_64/bin/x86_64-w64-mingw32-g++ && \ + test -r CRT/kcrt.opp && \ + test -r EASTL-build/libEASTL.a && \ + test -r EASTL-native-build/libEASTL.a; } || \ + { make deps JOBS=${BUILDJOBS:-4} Q= || { cat bld/build.log; false; }; } stage: deps only: - master @@ -34,7 +41,7 @@ makedeps-again: - git clean -df . - git clean -dfX . - git checkout . - - make -C . -f Makefile.deps -j "${BUILDJOBS:-4}" || { cat bld/build.log; false; } + - make deps JOBS=${BUILDJOBS:-4} Q= || { cat bld/build.log; false; } stage: deps only: - master @@ -42,16 +49,16 @@ makedeps-again: build: script: + - make help + - make help BUILD_NATIVE=1 - ls -alh w64-mingw32-sysroot/x86_64/ - ls -alh w64-mingw32-sysroot/x86_64/bin/ - pwd - mkdir -p ./mingw-w64-build && touch ./mingw-w64-build/mingw-w64-build - touch -m ./w64-mingw32-sysroot/x86_64/bin/x86_64-w64-mingw32-gcc - - make -C . -f Makefile.deps -j1 all BUILD_NATIVE= WERROR=1 Q= - make -j1 all WERROR=1 Q= - make -j1 install WERROR=1 Q= DESTDIR=_install - ls -alh _install - - make -C . -f Makefile.deps -j1 all BUILD_NATIVE=1 WERROR=1 Q= artifacts: expire_in: 1 week paths: |