From 354615368402d3b2bffcc5f744b0e32227c02e67 Mon Sep 17 00:00:00 2001 From: Liam Keegan <liam@keegan.ch> Date: Wed, 8 Sep 2021 09:39:40 +0200 Subject: [PATCH 1/2] update ci to match new sme static lib filenames: winXX -> winXX-mingw --- .ci/setup_static_deps | 4 ++-- dune-copasi.opts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/setup_static_deps b/.ci/setup_static_deps index 42757d4b5..ff6c1f9b5 100755 --- a/.ci/setup_static_deps +++ b/.ci/setup_static_deps @@ -3,7 +3,7 @@ # download and install other dependences (from sme by Liam) # variables from DUNE_OPTIONS_FILE -# OS_TARGET=linux|osx|win32|win64 +# OS_TARGET=linux|osx|win32-mingw|win64-mingw # CMAKE_INSTALL_PREFIX # (optional) SUDOCMD @@ -40,7 +40,7 @@ trap onfailure EXIT [[ -d /tmp/setup-static-deps ]] && ONFAILURE_MESSAGE+="run this script where no folder '/tmp/setup-static-deps' exists\n" && exit 1 mkdir /tmp/setup-static-deps && cd /tmp/setup-static-deps -if [[ ! "$OS_TARGET" =~ ^(linux|osx|win32|win64)$ ]]; then +if [[ ! "$OS_TARGET" =~ ^(linux|osx|win32-mingw|win64-mingw)$ ]]; then ONFAILURE_MESSAGE+="'$OS_TARGET' is not a known OS target\n" exit 1 fi diff --git a/dune-copasi.opts b/dune-copasi.opts index 2e3b5c7d1..01b5a6d11 100755 --- a/dune-copasi.opts +++ b/dune-copasi.opts @@ -49,8 +49,8 @@ if [[ -z $OS_TARGET ]]; then elif [[ "$OSTYPE" == "msys" ]]; then # Lightweight shell and GNU utilities compiled for Windows (part of MinGW) MACHINE="$(eval gcc -dumpmachine 2>&1)" - [[ "$MACHINE" = *'x86_64'* ]] && OS_TARGET="win64" - [[ "$MACHINE" = *'i686'* ]] && OS_TARGET="win32" + [[ "$MACHINE" = *'x86_64'* ]] && OS_TARGET="win64-mingw" + [[ "$MACHINE" = *'i686'* ]] && OS_TARGET="win32-mingw" export CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS:-"'-static -Wa,-mbig-obj -fvisibility=hidden -fpic'"} else OS_TARGET="$OSTYPE" -- GitLab From 61a40c67c94798db182f1ecf06ff44f34e295494 Mon Sep 17 00:00:00 2001 From: Liam Keegan <liam@keegan.ch> Date: Wed, 8 Sep 2021 10:44:33 +0200 Subject: [PATCH 2/2] use support/dune-copasi-v1.1.0 branch for typetree, pdelab --- .ci/setup_dune | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/setup_dune b/.ci/setup_dune index 36e6032d5..64fd0125d 100755 --- a/.ci/setup_dune +++ b/.ci/setup_dune @@ -66,7 +66,7 @@ done for module in typetree pdelab do - eval SETUP_dune_${module}_BRANCH=\"support/dune-copasi-latest\" + eval SETUP_dune_${module}_BRANCH=\"support/dune-copasi-v1.1.0\" eval SETUP_dune_${module}_REPO=\"https://gitlab.dune-project.org/copasi/dune-${module}.git\" done diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e09a827ce..9c67097d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ env: jobs: linux: name: Linux - runs-on: ubuntu-16.04 + runs-on: ubuntu-18.04 env: CMAKE_INSTALL_PREFIX: '/opt/smelibs' TERM: 'xterm-256color' -- GitLab