summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml74
1 files changed, 55 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7c750a..0368723 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,7 @@ variables: &base_vars
# Depth of clone. If no tag is made after this many commits, then
# the git describe call and version header generation will fail.
GIT_DEPTH: 100 # Will break again eventually.
+ GIT_SUBMODULE_STRATEGY: normal
.prerequisites: &prerequisites
before_script:
@@ -15,21 +16,21 @@ variables: &base_vars
- apt-get update
- apt-get install -y -qq $INSTALL_PACKAGES $DEBIAN_COMMON_PACKAGES
-
# Active server OS?
-re:ubuntu1804:build:
+re:ubuntu1804-attoconf:build:
<<: *prerequisites
stage: build
image: ubuntu:18.04
variables:
<<: *base_vars
- INSTALL_PACKAGES: python
+ INSTALL_PACKAGES: python3
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
+ - mkdir build-atto
+ - cd build-atto
+ - ../configure --user
- make
- whoami
- make install
@@ -37,23 +38,20 @@ re:ubuntu1804:build:
untracked: true
expire_in: 30 mins
-
-
-
# Next server OS?
-re:ubuntu2204:build:
+re:ubuntu2204-attoconf:build:
<<: *prerequisites
stage: build
image: ubuntu:22.04
variables:
<<: *base_vars
- INSTALL_PACKAGES: python2
+ INSTALL_PACKAGES: python3
script:
- - ln -s /usr/bin/python2 /usr/bin/python
- - git submodule update --init
- git fetch -t
- printf "Building TMW Athena version %s\n" "$(git describe --tags HEAD)"
- - ./configure --user
+ - mkdir build-atto
+ - cd build-atto
+ - ../configure --user
- make
- whoami
- make install
@@ -61,31 +59,69 @@ re:ubuntu2204:build:
untracked: true
expire_in: 30 mins
-
+# Next server OS, with cmake
+re:ubuntu2204:build:
+ <<: *prerequisites
+ stage: build
+ image: ubuntu:22.04
+ variables:
+ <<: *base_vars
+ INSTALL_PACKAGES: python3 cmake
+ script:
+ - git fetch -t
+ - printf "Building TMW Athena version %s\n" "$(git describe --tags HEAD)"
+ - mkdir build-cmake
+ - cd build-cmake
+ - cmake -DCMAKE_INSTALL_PREFIX=$HOME/.local ..
+ - make
+ - whoami
+ - make install
+ artifacts: # required for test stage
+ untracked: true
+ expire_in: 30 mins
# Disabled. fails with:
# (1) GDB failing to resolve a type
# (2) /usr/bin/ld: Dwarf Error: Can't find .debug_ranges section.
-.re:ubuntu1804:test:
+.re:ubuntu1804-attoconf:test:
<<: *prerequisites
stage: test
image: ubuntu:18.04
+ needs: ["ubuntu1804-attoconf:build"]
+ variables:
+ <<: *base_vars
+ INSTALL_PACKAGES: python3 gdb
+ script:
+ - printf "Testing TMW Athena version %s\n" "$(git describe --tags HEAD)"
+ - cd build-atto
+ - make test
+
+
+# Enabled tests
+re:ubuntu2204-attoconf:test:
+ <<: *prerequisites
+ stage: test
+ image: ubuntu:22.04
+ needs: ["re:ubuntu2204-attoconf:build"]
variables:
<<: *base_vars
- INSTALL_PACKAGES: python gdb
+ INSTALL_PACKAGES: python3 gdb
script:
- printf "Testing TMW Athena version %s\n" "$(git describe --tags HEAD)"
+ - cd build-atto
- make test
-re:ubuntu2204:test:
+# Disabled. Tests are not supported yet by the CMake project.
+.re:ubuntu2204:test:
<<: *prerequisites
stage: test
image: ubuntu:22.04
+ needs: ["re:ubuntu2204:build"]
variables:
<<: *base_vars
- INSTALL_PACKAGES: python2 gdb
+ INSTALL_PACKAGES: python3 gdb
script:
- - ln -s /usr/bin/python2 /usr/bin/python
- printf "Testing TMW Athena version %s\n" "$(git describe --tags HEAD)"
+ - cd build-cmake
- make test