From 1794fb09aa62b3f24d3627742f70489df1bfac63 Mon Sep 17 00:00:00 2001 From: Sylvain Corlay Date: Fri, 24 Dec 2021 10:35:59 +0100 Subject: [PATCH 1/4] .. --- .github/workflows/main.yml | 22 ++++++++-------------- environment-dev.yml | 1 + 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 334c5cc..281f883 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,30 +36,25 @@ jobs: run: | $HOME/micromamba-bin/micromamba install cmake cxx-compiler -c conda-forge -y - # Cannot use julia from setup-julia because of https://github.com/julia-actions/setup-julia/issues/89 - # - name: install julia - # uses: julia-actions/setup-julia@v1 - # with: - # version: 1.6.3 - - - name: install CxxWrap - run: | - julia -E "using Pkg; Pkg.add(PackageSpec(name=\"CxxWrap\", version=\"0.11.2\"))" - - name: cmake configure shell: bash -l {0} run: | - JlCxx_DIR=$(julia -E "using CxxWrap; joinpath(CxxWrap.prefix_path(), \"lib\", \"cmake\", \"JlCxx\")") - JlCxx_DIR=${JlCxx_DIR//\"/} + echo "CONDA PREFIX" + echo $CONDA_PREFIX mkdir -p build cd build cmake .. \ -D DOWNLOAD_GTEST=ON \ -D BUILD_TESTS=ON \ - -D JlCxx_DIR=$JlCxx_DIR \ -DCMAKE_BUILD_TYPE=Release \ -D CMAKE_INSTALL_PREFIX=$CONDA_PREFIX + - name: install CxxWrap + run: | + echo "CONDA PREFIX" + echo $CONDA_PREFIX + $CONDA_PREFIX/bin/julia -E "using Pkg; Pkg.add(PackageSpec(name=\"CxxWrap\", version=\"0.11.2\"))" + - name: build shell: bash -l {0} run: | @@ -122,7 +117,6 @@ jobs: # shell: bash -l {0} # run: | # call C:\Users\runneradmin\micromamba\condabin\micromamba.bat activate xtensor-julia - # micromamba install xtensor=0.24.0 -c conda-forge -y # micromamba install gtest -c conda-forge -y # - name: cmake configure diff --git a/environment-dev.yml b/environment-dev.yml index b01d972..db6e5f2 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -4,3 +4,4 @@ channels: dependencies: - cmake - xtensor=0.24.0 + - libcxxwrap-julia=0.8.3 From 40fbd27c890709731b88226b268561e4b451380d Mon Sep 17 00:00:00 2001 From: Sylvain Corlay Date: Fri, 24 Dec 2021 10:39:47 +0100 Subject: [PATCH 2/4] .. --- .github/workflows/main.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 281f883..1cda2d8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,8 +39,6 @@ jobs: - name: cmake configure shell: bash -l {0} run: | - echo "CONDA PREFIX" - echo $CONDA_PREFIX mkdir -p build cd build cmake .. \ @@ -50,9 +48,8 @@ jobs: -D CMAKE_INSTALL_PREFIX=$CONDA_PREFIX - name: install CxxWrap + shell: bash -l {0} run: | - echo "CONDA PREFIX" - echo $CONDA_PREFIX $CONDA_PREFIX/bin/julia -E "using Pkg; Pkg.add(PackageSpec(name=\"CxxWrap\", version=\"0.11.2\"))" - name: build From 0b598c077af79ee61f43a994c23a4844aaa088a8 Mon Sep 17 00:00:00 2001 From: Sylvain Corlay Date: Fri, 24 Dec 2021 10:43:53 +0100 Subject: [PATCH 3/4] .. --- .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 1cda2d8..ab3e64a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -50,7 +50,7 @@ jobs: - name: install CxxWrap shell: bash -l {0} run: | - $CONDA_PREFIX/bin/julia -E "using Pkg; Pkg.add(PackageSpec(name=\"CxxWrap\", version=\"0.11.2\"))" + julia -E "using Pkg; Pkg.add(PackageSpec(name=\"CxxWrap\", version=\"0.11.2\"))" - name: build shell: bash -l {0} From adb5cf47466c2e5afe4fca018c23b5465b249dbe Mon Sep 17 00:00:00 2001 From: Sylvain Corlay Date: Fri, 24 Dec 2021 12:04:28 +0100 Subject: [PATCH 4/4] Overrides --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ab3e64a..094cd89 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -50,6 +50,9 @@ jobs: - name: install CxxWrap shell: bash -l {0} run: | + export OVERRIDES=$CONDA_PREFIX/share/julia/artifacts/Overrides.toml + echo [3eaa8342-bff7-56a5-9981-c04077f7cee7] > $OVERRIDES + echo libcxxwrap = $CONDA_PREFIX > $OVERRIDES julia -E "using Pkg; Pkg.add(PackageSpec(name=\"CxxWrap\", version=\"0.11.2\"))" - name: build