SSH host keys have changed! See this Discourse post for details.

Commit d4953704 authored by Lars Bilke's avatar Lars Bilke
Browse files

Merge branch 'apple-arm-ci' into 'master'

[ci] Apple ARM (M1) jobs

See merge request !3757
parents 162f31e7 2da05e28
Pipeline #6503 passed with stages
in 83 minutes and 49 seconds
......@@ -3,12 +3,14 @@ build gui mac:
- .template-build-linux
- .test-artifacts
stage: build
tags: [mac]
tags:
- mac
- ${ARCHITECTURE}
needs: [meta]
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- changes:
- Applications/DataExplorer/**/*
- Applications/DataExplorer/**/*
- when: manual
allow_failure: true
variables:
......@@ -16,3 +18,6 @@ build gui mac:
CMAKE_ARGS: >-
-DOGS_USE_CONAN=auto
-DOGS_INSTALL_DEPENDENCIES=ON
parallel:
matrix:
- ARCHITECTURE: ["amd64"] # "arm64" not supported yet
build mac:
tags:
- mac
- ${ARCHITECTURE}
extends:
- .template-build-linux
- .test-artifacts
......@@ -11,3 +12,6 @@ build mac:
CMAKE_ARGS: >-
-DOGS_INSTALL_DEPENDENCIES=ON
-DOGS_USE_MFRONT=ON
parallel:
matrix:
- ARCHITECTURE: ["amd64", "arm64"]
......@@ -5,6 +5,7 @@ set(Python3_FIND_FRAMEWORK LAST)
if(OGS_USE_POETRY)
find_program(POETRY poetry)
if(POETRY)
set(Python3_FIND_STRATEGY VERSION)
find_package(
Python3 ${ogs.minimum_version.python} COMPONENTS Interpreter
REQUIRED
......@@ -20,6 +21,10 @@ if(OGS_USE_POETRY)
)
endif()
if(NOT EXISTS ${PROJECT_BINARY_DIR}/.venv)
execute_process(
COMMAND ${CMD_COMMAND} poetry env use ${Python3_EXECUTABLE}
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)
execute_process(
COMMAND ${CMD_COMMAND} poetry install
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
......
......@@ -9,7 +9,7 @@
"toolset": "142",
"compiler": "19.24"
},
"conan": "1.33.0",
"conan": "1.34.0",
"git": "2.14",
"cmake": "3.14",
"hugo": "0.64.1",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment