Merge pull request #83 from IsabelParedes/workflow

Update CI
jupyter-xeus · Jan 2, 2024 · 4189a98 · 4189a98
2 parents a0979b6 + c7fcc2f
commit 4189a98
Showing 1 changed file with 16 additions and 26 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-    - main 
+    - main
   pull_request:
     branches:
     - main
@@ -29,13 +29,12 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Get number of CPU cores
-        uses: SimenB/github-actions-cpu-cores@v1
+        uses: SimenB/github-actions-cpu-cores@v2
 
-      - name: install mamba
-        uses: mamba-org/provision-with-micromamba@main
+      - name: Install micromamba
+        uses: mamba-org/setup-micromamba@v1
         with:
           environment-file: environment-dev.yml
-          environment-name: xeus-sql
 
       - name: Make build directory
         run: mkdir build
@@ -52,7 +51,7 @@ jobs:
           CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DXSQL_BUILD_STATIC=OFF"
           echo "CMAKE_EXTRA_ARGS=$CMAKE_EXTRA_ARGS" >> $GITHUB_ENV
 
-      - name: cmake configure
+      - name: Configure cmake
         run: |
           cmake .. \
             -D CMAKE_PREFIX_PATH=$CONDA_PREFIX \
@@ -86,16 +85,13 @@ jobs:
     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
+            cmd.exe
           environment-file: environment-dev.yml
-          environment-name: xeus-sql
-
-      - 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
@@ -112,10 +108,9 @@ jobs:
           CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DXSQL_BUILD_STATIC=OFF"
           echo "CMAKE_EXTRA_ARGS=$CMAKE_EXTRA_ARGS" >> $GITHUB_ENV
 
-      - name: cmake configure
-        shell: cmd
+      - name: Configure cmake
+        shell: cmd /C call {0}
         run: |
-          call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xeus-sql
           cmake .. ^
             -GNinja ^
             -DCMAKE_BUILD_TYPE=Release ^
@@ -125,20 +120,15 @@ jobs:
             ${{ env.CMAKE_EXTRA_ARGS }}
         working-directory: build
 
-      - name: build
-        shell: cmd
+      - name: Build
+        shell: cmd /C call {0}
         run: |
-          call C:\Users\runneradmin\micromamba-root\condabin\micromamba.bat activate xeus-sql
           set CL=/MP
           ninja install
         working-directory: build
 
       - name: Test xeus-sql C++
         shell: cmd /C call {0}
-        run: |
-          micromamba activate xeus-sql
-          test_xeus_sql
+        run: test_xeus_sql
         timeout-minutes: 4
-        working-directory: build/test
-
-
+        working-directory: build\test