diff options
| -rw-r--r-- | .gitlab-ci.yml | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd2312f..fdfbf15 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,10 @@ # Copied in from Moubootaur Legends's Hercules .gitlab-ci.yml stages: - build -# - test + - test variables: &base_vars - DEBIAN_COMMON_PACKAGES: make python3 git gcc g++ + DEBIAN_COMMON_PACKAGES: make python3.7 git gcc g++ GIT_DEPTH: 100 # Will break again eventually. .prerequisites: &prerequisites @@ -37,27 +37,7 @@ variables: &base_vars untracked: true expire_in: 30 mins -re:ubuntu1804REPL:build: - <<: *prerequisites - stage: build - image: ubuntu:18.04 - variables: - <<: *base_vars - script: - - echo "Building TMW Athena $CI_BUILD_NAME" - - git submodule update --init - - git fetch -t - - printf "Building TMW Athena version %s\n" "$(git describe --tags HEAD)" - - ./configure --user -# - make -# - make install -# artifacts: # required for test stage -# untracked: true -# expire_in: 30 mins - - - -.re:ubuntu1804:build: +re:ubuntu1804:build: <<: *prerequisites stage: build image: ubuntu:18.04 @@ -88,7 +68,7 @@ re:ubuntu1804REPL:build: - make test -.re:ubuntu1804:test: +re:ubuntu1804:test: <<: *prerequisites stage: test image: ubuntu:18.04 |