Specify the path to the file of the conda environment to create when …

…running a job
slaclab · Nov 28, 2022 · 8b6c908 · 8b6c908
1 parent 4b37589
commit 8b6c908
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/build_environment.yml b/.github/workflows/build_environment.yml
@@ -9,9 +9,10 @@ jobs:
   build:
     env:
       ENVIRONMENT_NAME: python3.8env
+      ENVIRONMENT_FILE_PATH: environment.yml
       TEST_FILE: test.sh
     runs-on: ubuntu-latest
     name: Build environment
     steps:
       - name: Build environment
-        uses: jbellister-slac/lcls-rhel6-conda-pack@e0c38e0d501ca34c5e33500e779ff28d13dd0d00
+        uses: jbellister-slac/lcls-rhel6-conda-pack@6b0b0a01c4c67cc0275ea7bedf9e9d51ae54c9c1
diff --git a/.github/workflows/publish_environment.yml b/.github/workflows/publish_environment.yml
@@ -9,12 +9,13 @@ jobs:
   build:
     env:
       ENVIRONMENT_NAME: python3.8env
+      ENVIRONMENT_FILE_PATH: environment.yml
       TEST_FILE: test.sh
     runs-on: ubuntu-latest
     name: Build environment
     steps:
       - name: Build environment
-        uses: jbellister-slac/lcls-rhel6-conda-pack@e0c38e0d501ca34c5e33500e779ff28d13dd0d00
+        uses: jbellister-slac/lcls-rhel6-conda-pack@6b0b0a01c4c67cc0275ea7bedf9e9d51ae54c9c1
       - name: Upload artifact to release
         uses: svenstaro/upload-release-action@v2
         with:

diff --git a/.github/workflows/publish_nightly.yml b/.github/workflows/publish_nightly.yml
@@ -8,12 +8,13 @@ jobs:
   build:
     env:
       ENVIRONMENT_NAME: python3.8env
+      ENVIRONMENT_FILE_PATH: nightly-environment.yml
       TEST_FILE: test.sh
     runs-on: ubuntu-latest
     name: Build environment
     steps:
       - name: Build environment
-        uses: jbellister-slac/lcls-rhel6-conda-pack@e0c38e0d501ca34c5e33500e779ff28d13dd0d00
+        uses: jbellister-slac/lcls-rhel6-conda-pack@6b0b0a01c4c67cc0275ea7bedf9e9d51ae54c9c1
       - name: Upload artifact to release
         uses: svenstaro/upload-release-action@v2
         with:

diff --git a/nightly-environment.yml b/nightly-environment.yml
@@ -47,7 +47,6 @@ dependencies:
   - numpy
   - openmpi
   - openpmd-beamphysics
-  - p4p>=3.5.5
   - pandas
   - pip
   - pint
@@ -92,7 +91,7 @@ dependencies:
     - git+https://github.com/slaclab/mps_history
     - ipaddress
     - Cheetah3
-    - plex
+    - p4p
     - opencv-contrib-python==4.2.0.34
 #
 # Stuff that isn't on PyPI or GitHub that is manually installed in prod