Fix typo in name of yaml file

.github/workflows/gh-ci.yaml

@@ -12,7 +12,7 @@ env:
   DOCKER_ORG: coffeateam
   GITHUB_SHA: ${{ github.sha }}
   GITHUB_REF: ${{ github.ref }}
-  release: "2024.1.0"
+  release: "2024.1.1"
   releasev0: "0.7.22"
 
 jobs:
@@ -80,7 +80,7 @@ jobs:
         echo "::set-output name=tags::${tags}"
 
     - name: Build base v0
-      if: ${{ matrix.image_dir }} == 'coffea-basev0'
+      if: ${{ matrix.image_dir == 'coffea-basev0' }}
       uses: docker/build-push-action@v5
       with:
         load: true
@@ -89,10 +89,10 @@ jobs:
         file: ${{ matrix.image_dir }}/Dockerfile.${{ matrix.distro }}
         build-args: |
           python=${{ matrix.python }}
-          release=${{ env.releasev0 }}
+          releasev0=${{ env.releasev0 }}
 
     - name: Build base v1
-      if: ${{ matrix.image_dir }} != 'coffea-basev0'
+      if: ${{ matrix.image_dir != 'coffea-basev0' }}
       uses: docker/build-push-action@v5
       with:
         load: true
@@ -130,7 +130,7 @@ jobs:
         sh -c "pip install -U pytest && cd tmp/workspace && pytest"
 
     - name: Build and push v0
-      if: ${{ matrix.image_dir }} != 'coffea-basev0'
+      if: ${{ matrix.image_dir != 'coffea-basev0' }}
       uses: docker/build-push-action@v5
       with:
         platforms: linux/amd64
@@ -143,7 +143,7 @@ jobs:
           release=${{ env.release }}
 
     - name: Build and push v1
-      if: ${{ matrix.image_dir }} == 'coffea-basev0'
+      if: ${{ matrix.image_dir == 'coffea-basev0' }}
       uses: docker/build-push-action@v5
       with:
         platforms: linux/amd64
@@ -153,5 +153,5 @@ jobs:
         file: ${{ matrix.image_dir }}/Dockerfile.${{ matrix.distro }}
         build-args: |
           python=${{ matrix.python }}
-          release=${{ env.releasev0 }}
+          releasev0=${{ env.releasev0 }}
 

.github/workflows/watch-conda.yaml

@@ -7,7 +7,7 @@ on:
 jobs:
   check-version:
     runs-on: ubuntu-latest
-    if: github.repository == 'coffeateam/docker-coffea-base'
+    if: github.repository == 'coffeateam/af-images'
 
     steps:
       - uses: actions/checkout@v2
@@ -26,15 +26,15 @@ jobs:
           package: "coffea"
 
       - name: Find and Replace Release 0.x release
-        if: ${{ ! startsWith(steps.latest_version.outputs.version, '0.') }}
+        if: ${{ startsWith(steps.latest_version.outputs.version, '0.') }}
         uses: jacobtomlinson/[email protected]
         with:
           find: ${{ steps.current_version.outputs.env_releasev0 }}
           replace: ${{ steps.latest_version.outputs.version }}
           regex: false
 
       - name: Find and Replace Release Calver release
-        if: ${{ ! startsWith(steps.latest_version.outputs.version, '20') }}
+        if: ${{ startsWith(steps.latest_version.outputs.version, '20') }}
         uses: jacobtomlinson/[email protected]
         with:
           find: ${{ steps.current_version.outputs.env_release }}

coffea-basev0/Dockerfile.alma8

@@ -15,10 +15,10 @@ RUN yum -y update \
      && rpm -e --nodeps curl bzip2 \
      && yum clean all
 
-COPY environment.yml /
+COPY environment.yaml /
 
 RUN mamba install --yes python=${PYTHON_VERSION} \
-     && mamba env update --file /environment.yml \
+     && mamba env update --file /environment.yaml \
      && mamba clean -y --all
 
 # Make a symbolic link between installation /opt/conda/etc/grid-security and actual directory /etc/grid-security

coffea-basev0/Dockerfile.ubuntu

@@ -12,10 +12,10 @@ RUN apt-get update \
      && apt-get install -yq --no-install-recommends libarchive-dev zsh \
      && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-COPY environment.yml /
+COPY environment.yaml /
 
 RUN mamba install --yes python=${PYTHON_VERSION} \
-     && mamba env update --file /environment.yml \
+     && mamba env update --file /environment.yaml \
      && mamba clean -y --all
 
 # Make a symbolic link between installation /opt/conda/etc/grid-security and actual directory /etc/grid-security

coffea-basev0/environment.yaml

@@ -43,6 +43,7 @@ dependencies:
   - pytorch=1.12
   - torch-scatter
   - pip
+  - coffea=0.7.22
   - pip:
     - fastjet # to be added to conda-forge: https://github.com/scikit-hep/fastjet/issues/133
     - tritonclient[all]
@@ -53,4 +54,3 @@ dependencies:
     - torch-spline-conv
     - torch-geometric
     - fsspec-xrootd
-    - coffea==2024.1.2 # release candidates are not in conda-forge

coffea-dask/Dockerfile.alma8

@@ -15,10 +15,10 @@ RUN yum -y update \
      && rpm -e --nodeps curl bzip2 \
      && yum clean all
 
-COPY environment.yml /
+COPY environment.yaml /
 
 RUN mamba install --yes python=${PYTHON_VERSION} \
-     && mamba env update --file /environment.yml \
+     && mamba env update --file /environment.yaml \
      && mamba clean -y --all
 
 # Make a symbolic link between installation /opt/conda/etc/grid-security and actual directory /etc/grid-security

coffea-dask/Dockerfile.ubuntu

@@ -12,10 +12,10 @@ RUN apt-get update \
      && apt-get install -yq --no-install-recommends libarchive-dev zsh \
      && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-COPY environment.yml /
+COPY environment.yaml /
 
 RUN mamba install --yes python=${PYTHON_VERSION} \
-     && mamba env update --file /environment.yml \
+     && mamba env update --file /environment.yaml \
      && mamba clean -y --all
 
 # Make a symbolic link between installation /opt/conda/etc/grid-security and actual directory /etc/grid-security

coffea-dask/environment.yaml

@@ -43,6 +43,7 @@ dependencies:
   - pytorch=1.12
   - torch-scatter
   - pip
+  - coffea=v2024.1.2
   - pip:
     - fastjet # to be added to conda-forge: https://github.com/scikit-hep/fastjet/issues/133
     - tritonclient[all]
@@ -53,4 +54,3 @@ dependencies:
     - torch-spline-conv
     - torch-geometric
     - fsspec-xrootd
-    - coffea==v2024.1.2 # release candidates are not in conda-forge