From c34fd220db1f8002bad29078dee34f0cc0b4e046 Mon Sep 17 00:00:00 2001 From: psi29a Date: Wed, 7 Oct 2020 17:31:29 +0000 Subject: [PATCH 1/7] Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2cb111a1a6..27cc6d815c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,9 +59,6 @@ Debian_Clang_tests: MacOS: tags: - macos - - xcode - except: - - branches # because our CI VMs are not public, MRs can't use them and timeout stage: build allow_failure: true script: From a47d96ce0b06354f7b560b8d031cd507dfa0acf5 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Wed, 7 Oct 2020 19:06:28 +0000 Subject: [PATCH 2/7] Install CMake on MacOS if it's missing --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 27cc6d815c..a04e347c43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,7 +60,8 @@ MacOS: tags: - macos stage: build - allow_failure: true + before_script: + - command -v cmake >/dev/null 2>&1 || brew install cmake script: - rm -fr build/* # remove anything in the build directory - CI/before_install.osx.sh From cfd9268a74ea088b4d34fef8dbebaed57f9768d3 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Wed, 7 Oct 2020 19:12:13 +0000 Subject: [PATCH 3/7] Install Qt if missing --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a04e347c43..8f53c69425 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,6 +62,7 @@ MacOS: stage: build before_script: - command -v cmake >/dev/null 2>&1 || brew install cmake + - brew list qt || brew install qt script: - rm -fr build/* # remove anything in the build directory - CI/before_install.osx.sh From 5515bc94b7b95b167e84c4b13fad6a8a3740af52 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Wed, 7 Oct 2020 21:04:36 +0000 Subject: [PATCH 4/7] Keep logs as artifacts --- .gitlab-ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f53c69425..77650aea55 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,6 +71,15 @@ MacOS: artifacts: paths: - build/OpenMW-*.dmg + - "*.log" + - build/*.log + - build/*/*.log + - build/*/*/*.log + - build/*/*/*/*.log + - build/*/*/*/*/*.log + - build/*/*/*/*/*/*.log + - build/*/*/*/*/*/*/*.log + - build/*/*/*/*/*/*/*/*.log variables: &engine-targets targets: "openmw,openmw-essimporter,openmw-iniimporter,openmw-launcher,openmw-wizard" From 2f1b7c4d2ff823ac6b2b490567429be64338054c Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Thu, 8 Oct 2020 21:35:37 +0000 Subject: [PATCH 5/7] Rename DMG file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 77650aea55..d604e90c86 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,6 +68,7 @@ MacOS: - CI/before_install.osx.sh - CI/before_script.osx.sh - cd build; make -j2 package + - for dmg in *.dmg; do mv "$dmg" "${dmg%.dmg}_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}.dmg"; done artifacts: paths: - build/OpenMW-*.dmg From 3a39e1f8f8fd1dacf5c28a2d558c8dc8bc05f0d6 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Thu, 8 Oct 2020 22:25:16 +0000 Subject: [PATCH 6/7] config was from Windows CI --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d604e90c86..d335dfd91b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,7 +68,7 @@ MacOS: - CI/before_install.osx.sh - CI/before_script.osx.sh - cd build; make -j2 package - - for dmg in *.dmg; do mv "$dmg" "${dmg%.dmg}_${config}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}.dmg"; done + - for dmg in *.dmg; do mv "$dmg" "${dmg%.dmg}_${CI_COMMIT_REF_NAME}_${CI_JOB_ID}.dmg"; done artifacts: paths: - build/OpenMW-*.dmg From ef41edba9b6945ad50c8a3509d6bf0ddbf31b065 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Fri, 9 Oct 2020 13:56:21 +0000 Subject: [PATCH 7/7] Install tools in before_install.osx.sh --- .gitlab-ci.yml | 13 +------------ CI/before_install.osx.sh | 5 ++++- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d335dfd91b..8edf66569f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,9 +60,6 @@ MacOS: tags: - macos stage: build - before_script: - - command -v cmake >/dev/null 2>&1 || brew install cmake - - brew list qt || brew install qt script: - rm -fr build/* # remove anything in the build directory - CI/before_install.osx.sh @@ -72,15 +69,7 @@ MacOS: artifacts: paths: - build/OpenMW-*.dmg - - "*.log" - - build/*.log - - build/*/*.log - - build/*/*/*.log - - build/*/*/*/*.log - - build/*/*/*/*/*.log - - build/*/*/*/*/*/*.log - - build/*/*/*/*/*/*/*.log - - build/*/*/*/*/*/*/*/*.log + - "build/**/*.log" variables: &engine-targets targets: "openmw,openmw-essimporter,openmw-iniimporter,openmw-launcher,openmw-wizard" diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index 5dae1f1021..c3514e25be 100755 --- a/CI/before_install.osx.sh +++ b/CI/before_install.osx.sh @@ -1,6 +1,9 @@ #!/bin/sh -e -brew install ccache +# Some of these tools can come from places other than brew, so check before installing +command -v ccache >/dev/null 2>&1 || brew install ccache +command -v cmake >/dev/null 2>&1 || brew install cmake +command -v qmake >/dev/null 2>&1 || brew install qt curl -fSL -R -J https://downloads.openmw.org/osx/dependencies/openmw-deps-ef2462c.zip -o ~/openmw-deps.zip unzip -o ~/openmw-deps.zip -d /private/tmp/openmw-deps > /dev/null