From 503868fa628aec8769b95d092aaf8265c70ef49e Mon Sep 17 00:00:00 2001 From: Sylvain Corlay Date: Sat, 1 Jan 2022 08:20:32 +0100 Subject: [PATCH 1/2] Simplify windows action --- .github/workflows/main.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4ce4209..29c4487 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -93,12 +93,6 @@ jobs: environment-file: environment-dev-win.yml environment-name: xtensor-julia - - name: micromamba shell hook - shell: powershell - run: | - micromamba shell hook -s cmd.exe -p C:\Users\runneradmin\micromamba - Get-Content -Path C:\Users\runneradmin\micromamba\condabin\mamba_hook.bat - - name: install julia uses: julia-actions/setup-julia@v1 with: @@ -110,14 +104,13 @@ jobs: platform: x64 - name: install CxxWrap - shell: cmd + shell: cmd /C CALL {0} run: | julia -E "using Pkg; Pkg.add(PackageSpec(name=\"CxxWrap\", version=\"0.11.2\"))" - name: cmake configure - shell: cmd + shell: cmd /C CALL {0} run: | - call C:\Users\runneradmin\micromamba\condabin\micromamba.bat activate xtensor-julia julia -E "using CxxWrap; joinpath(CxxWrap.prefix_path(), \"lib\", \"cmake\", \"JlCxx\")" > temp.txt set /p JlCxx_DIR= Date: Sat, 1 Jan 2022 12:15:40 +0100 Subject: [PATCH 2/2] .. --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 29c4487..c6a53ea 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -104,13 +104,13 @@ jobs: platform: x64 - name: install CxxWrap - shell: cmd /C CALL {0} - run: | + shell: cmd /C call {0} + run: >- julia -E "using Pkg; Pkg.add(PackageSpec(name=\"CxxWrap\", version=\"0.11.2\"))" - name: cmake configure - shell: cmd /C CALL {0} - run: | + shell: cmd /C call {0} + run: >- julia -E "using CxxWrap; joinpath(CxxWrap.prefix_path(), \"lib\", \"cmake\", \"JlCxx\")" > temp.txt set /p JlCxx_DIR=- cd build cmake --build .