From a97b562bdc3c2fcc2c9788c0398da8846791b985 Mon Sep 17 00:00:00 2001 From: Sylvain Corlay Date: Tue, 28 Dec 2021 20:42:23 +0100 Subject: [PATCH 1/2] Use overrides --- .github/workflows/main.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4ce4209..f094812 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -50,11 +50,13 @@ jobs: - name: install CxxWrap shell: bash -l {0} run: | + export OVERRIDES=$CONDA_PREFIX/share/julia/artifacts/Overrides.toml + mkdir -p "${OVERRIDES%/*}" + touch $OVERRIDES + echo [3eaa8342-bff7-56a5-9981-c04077f7cee7] >> $OVERRIDES + echo libcxxwrap = \"$CONDA_PREFIX/lib\" >> $OVERRIDES + cat $OVERRIDES julia -E "using Pkg; Pkg.add(PackageSpec(name=\"CxxWrap\", version=\"0.11.2\"))" - export CXXWRAP_PREFIX=$(julia -E "using CxxWrap; CxxWrap.prefix_path()") - export CXXWRAP_PREFIX=$(eval echo $CXXWRAP_PREFIX) - rm -rf $CXXWRAP_PREFIX - ln -s $CONDA_PREFIX $CXXWRAP_PREFIX - name: build shell: bash -l {0} From e123538c3172b80bea6ab376023f2c9010530c11 Mon Sep 17 00:00:00 2001 From: Sylvain Corlay Date: Thu, 30 Dec 2021 09:43:36 +0100 Subject: [PATCH 2/2] Overrides --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f094812..5d58a7c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,7 +54,7 @@ jobs: mkdir -p "${OVERRIDES%/*}" touch $OVERRIDES echo [3eaa8342-bff7-56a5-9981-c04077f7cee7] >> $OVERRIDES - echo libcxxwrap = \"$CONDA_PREFIX/lib\" >> $OVERRIDES + echo libcxxwrap = \"$CONDA_PREFIX/bin\" >> $OVERRIDES cat $OVERRIDES julia -E "using Pkg; Pkg.add(PackageSpec(name=\"CxxWrap\", version=\"0.11.2\"))"