diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-06-19 10:10:15 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-06-19 10:10:15 +0200 |
| commit | 61d02a395b0ca594640f0fb917d7162a5aba2c37 (patch) | |
| tree | 7dd6f7f540dda3d89d37bc7e19f3f4d27dd53c85 /.gitlab-ci.yml | |
| parent | 5da59b807d9840fb23feb42df729bf5e88ee9678 (diff) | |
| parent | ac0b338b3e026d0d05a447894de9a6a994da82dc (diff) | |
| download | mana-61d02a395b0ca594640f0fb917d7162a5aba2c37.tar.gz mana-61d02a395b0ca594640f0fb917d7162a5aba2c37.tar.bz2 mana-61d02a395b0ca594640f0fb917d7162a5aba2c37.tar.xz mana-61d02a395b0ca594640f0fb917d7162a5aba2c37.zip | |
Merge branch 'master' into online-player-listonline-player-list
Conflicts:
src/net/tmwa/chathandler.cpp
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2fae39e..b29447ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,8 @@ ubuntu-build: cache: paths: - ccache + variables: + GIT_SUBMODULE_STRATEGY: normal before_script: - export CCACHE_BASEDIR="$PWD" - export CCACHE_DIR="$PWD/ccache" @@ -49,3 +51,10 @@ macos-build: script: - cmake -G Ninja -B build . - cmake --build build + - cd build + - cpack -G DragNDrop + - mv Mana-*.dmg .. + artifacts: + name: "macos-dmg-$CI_COMMIT_REF_SLUG" + paths: + - Mana-*.dmg |