Merge pull request #99 from sbillinge/ci2

remove nsls2forge and correct typo in master branch of tests.yml in g…
xpdAcq · Jul 29, 2023 · 3cca714 · 3cca714
2 parents 0f53695 + ef3060c
commit 3cca714
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: test
-          channels: nsls2forge,conda-forge
+          channels: conda-forge
           auto-update-conda: true
 
       - name: install requirements

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,7 +3,7 @@ name: Test
 on:
   push:
     branches:
-      - mas
+      - master
   pull_request:
   workflow_dispatch:
 
@@ -37,9 +37,8 @@ jobs:
           auto-activate-base: false
 
       - name: install requirements
-        run: >-
-          conda install --file requirements.txt
-          conda install --file requirements-dev.txt
+        run: |
+          conda install --file requirements.txt --file requirements-dev.txt
 
       - name: install the package
         run: python -m pip install . --no-deps