Use GH action to setup Conda

mxcube · Jul 24, 2023 · c33c8ce · c33c8ce
1 parent 9bb4621
commit c33c8ce
Showing 1 changed file with 20 additions and 13 deletions.
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -30,34 +30,41 @@ jobs:
           - 6379:6379
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+      - name: Checkout 🏷️
+        uses: actions/checkout@v3
+
+      - name: Install LDAP dependencies
+        run: sudo apt-get -y install libsasl2-dev libldap2-dev libssl-dev
+
+      - name: Set up Conda
+        uses: conda-incubator/setup-miniconda@v2
         with:
+          activate-environment: mxcubeweb
+          auto-activate-base: false
+          auto-update-conda: true
+          environment-file: conda-environment.yml
           python-version: ${{ matrix.python-version }}
-      - name: Add conda to system path
-        run: |
-          # $CONDA is an environment variable pointing to the root of the miniconda directory
-          echo $CONDA/bin >> $GITHUB_PATH
-      - name: Install ldap dependencies
-        run: sudo apt-get -y install libsasl2-dev libldap2-dev libssl-dev
+
       - name: Install dependencies
         run: |
-          conda env update --file conda-environment.yml --name base
           pip install -e .
+          npm install --prefix ./ui
+
       - name: Build UI
         run: |
-          npm install --prefix ./ui 
           npm run --prefix ./ui build
         env:
           DISABLE_ESLINT_PLUGIN: true
-      - name: Run mxcube backend
+
+      - name: Start MXCuBE server
         run: |
           mxcubeweb-server -r ./test/HardwareObjectsMockup.xml/ --static-folder ./ui/build/ -L debug &
-      - name: Cypress run
+
+      - name: Run Cypress
         uses: cypress-io/github-action@v5
         with:
           working-directory: ui
+
       - uses: actions/upload-artifact@v3
         if: failure()
         with: