Fixing windows build

compiler-research · Jan 2, 2024 · ac44e93 · ac44e93
1 parent b06c4e1
commit ac44e93
Showing 1 changed file with 60 additions and 25 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -60,48 +60,83 @@ jobs:
           cd test
           pytest .  --reruns 5
 
-  win:
+  # win:
 
-    runs-on: ${{ matrix.os }}
+  #   runs-on: ${{ matrix.os }}
 
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       os: [ windows-latest]
+
+  #   steps:
+  #     - uses: actions/checkout@v4
+
+  #     - name: install mamba
+  #       uses: mamba-org/provision-with-micromamba@main
+  #       with:
+  #         environment-file: environment-dev.yml
+  #         environment-name: xeus-cpp
+
+  #     - name: micromamba shell hook
+  #       shell: powershell
+  #       run: |
+  #         micromamba shell hook -s cmd.exe -p C:\Users\runneradmin\micromamba-root
+
+  #     - name: cmake configure
+  #       shell: powershell
+  #       run: |
+  #         mkdir -p bld
+  #         cd bld
+  #         cmake .. -DCMAKE_BUILD_TYPE=Release  -DDEPENDENCY_SEARCH_PREFIX="%CONDA_PREFIX%\Library" -DCMAKE_PREFIX_PATH="%CONDA_PREFIX%\Library" -DCMAKE_INSTALL_PREFIX="%CONDA_PREFIX%"
+
+  #     - name: build
+  #       shell: powershell
+  #       run: |
+  #         cd bld
+  #         cmake --build . --target ALL_BUILD
+
+      # - name: test
+      #   shell: cmd
+      #   run: |
+      #     call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xeus-cpp
+      #     cd test
+      #     pytest .  --reruns 5
+
+  win:
+
+    runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: false
       matrix:
-        os: [ windows-latest]
+        os: [ windows-latest ]
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: install mamba
-        uses: mamba-org/provision-with-micromamba@main
+      - name: Install micromamba
+        uses: mamba-org/setup-micromamba@v1
         with:
+          init-shell: powershell
           environment-file: environment-dev.yml
-          environment-name: xeus-cpp
 
-      - name: micromamba shell hook
-        shell: powershell
-        run: |
-          micromamba shell hook -s cmd.exe -p C:\Users\runneradmin\micromamba-root
+      - name: Make build directory
+        run: mkdir build
 
-      - name: cmake configure
+      - name: Configure cmake
         shell: powershell
         run: |
-          mkdir -p bld
-          cd bld
-          cmake .. -DCMAKE_BUILD_TYPE=Release  -DDEPENDENCY_SEARCH_PREFIX="%CONDA_PREFIX%\Library" -DCMAKE_PREFIX_PATH="%CONDA_PREFIX%\Library" -DCMAKE_INSTALL_PREFIX="%CONDA_PREFIX%"
+          cmake .. `
+            -DCMAKE_BUILD_TYPE=Release  `
+            -DDEPENDENCY_SEARCH_PREFIX="%CONDA_PREFIX%\Library" `
+            -DCMAKE_PREFIX_PATH="%CONDA_PREFIX%\Library"
+        working-directory: build
 
-      - name: build
+      - name: Build
         shell: powershell
-        run: |
-          cd bld
-          cmake --build . --target ALL_BUILD
-
-      # - name: test
-      #   shell: cmd
-      #   run: |
-      #     call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xeus-cpp
-      #     cd test
-      #     pytest .  --reruns 5
+        run: cmake --build . --target ALL_BUILD
+        working-directory: build
 
   emscripten_wasm_docker:
     runs-on: ubuntu-20.04