Try to fix CI macOS

fluiddyn · Nov 6, 2024 · a80a679 · a80a679
1 parent 33a2885
commit a80a679
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/unix.yml b/.github/workflows/unix.yml
@@ -35,17 +35,16 @@ jobs:
           python -m pip install -e .
           which conda-app
 
-      - name: test install mercurial
+      - name: test install mercurial and pipx
         run: |
           conda-app install mercurial
+          which hg
           conda-app list
-
-      - name: test install pipx
-        run: |
           conda-app install pipx python=3.12
           conda-app list
-          pipx --version
+          which pipx
           conda-app uninstall pipx -y
+          conda-app list
 
       - name: test installed mercurial
         run: |

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -16,11 +16,11 @@ test-run:
     - conda --version
     - pip install .
     - conda-app install mercurial
+    - . ~/.bashrc
     - conda-app install pipx python=3.11
     - conda env list
-    - pipx --version
     - conda-app uninstall pipx -y
-    - . ~/.bashrc
+    - pipx --version
     - hg debuginstall
     - mkdir -p $HOME/tmp
     - cd $HOME/tmp