diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 334c5cc..094cd89 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//\"/} 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 + 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 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