From 58b4cab06418104733edbaa9994107f0aaa005d8 Mon Sep 17 00:00:00 2001 From: Lucian Smith Date: Mon, 27 Jan 2025 17:32:54 -0800 Subject: [PATCH] Fix workflow. * Use MacOS13 * Use latest dependencies. * Fix installed swig 4.2 on ubuntu 24. --- .github/workflows/main.yml | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5bf53f13b7..7a1a50103f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,14 +15,14 @@ jobs: fail-fast: false matrix: platform: - - name: macos-12-release + - name: macos-13-release os_type: macos - os_name: macos-12 + os_name: macos-13 build_type: Release build_python: ON - - name: macos-12-debug + - name: macos-13-debug os_type: macos - os_name: macos-12 + os_name: macos-13 build_type: Debug build_python: OFF - name: macos-14-release @@ -64,7 +64,7 @@ jobs: libroadrunner_deps_owner: [ "sys-bio" ] libroadrunner_deps_repo: [ "libroadrunner-deps" ] libroadrunner_deps_name: [ "libroadrunner-deps" ] - libroadrunner_deps_release_version: [ "v2.2.8" ] + libroadrunner_deps_release_version: [ "v2.2.13" ] llvm_owner: [ "sys-bio" ] llvm_repo: [ "llvm-13.x" ] llvm_name: [ "llvm-13.x" ] @@ -301,7 +301,7 @@ jobs: shell: bash run: | cd ${RUNNER_WORKSPACE} - # running against the latest version of swig fails, os we build version 4.0.2 + # running against the latest version of swig fails, so we build version 4.0.2 if [ "${{ matrix.platform.os_type }}" == 'macos' ]; then brew install pcre pcre2 mkdir -p ${RUNNER_WORKSPACE}/swig @@ -335,6 +335,21 @@ jobs: make make install echo SWIG_DIR="-DSWIG_EXECUTABLE=${RUNNER_WORKSPACE}/swig/install-swig/bin/swig" >> $GITHUB_ENV + elif [ "${{ matrix.platform.os_type }}" == 'ubuntu' ]; then + # To fix installed swig 4.2: + sudo sed -i "681,684d;686d" /usr/share/swig4.0/swig.swg + # mkdir -p swig + # cd swig + # curl -L https://sourceforge.net/projects/swig/files/swig/swig-4.3.0/swig-4.3.0.tar.gz/download > swig.tar.gz + # tar -zxf swig.tar.gz + # rm swig.tar.gz + # mkdir -p install-swig + # cd swig-4.3.0/ + # sed -i "677,680d;682d" Lib/swig.swg + # ./configure --disable-dependency-tracking --prefix=${RUNNER_WORKSPACE}/swig/install-swig + # make + # make install + # echo SWIG_DIR="-DSWIG_EXECUTABLE=${RUNNER_WORKSPACE}/swig/install-swig/bin/swig" >> $GITHUB_ENV fi echo PYTHON_DIR="-DPython_ROOT_DIR=${{ env.python_v1_dir }}" >> $GITHUB_ENV