From 57a8ee1a63e704e771a074c985cf623139e34c4d Mon Sep 17 00:00:00 2001 From: Oksana Shadura Date: Fri, 9 Feb 2024 15:12:56 +0100 Subject: [PATCH] Fix typo in name of yaml file --- .github/workflows/gh-ci.yaml | 14 +++++++------- .github/workflows/watch-conda.yaml | 6 +++--- coffea-basev0/Dockerfile.alma8 | 4 ++-- coffea-basev0/Dockerfile.ubuntu | 4 ++-- coffea-basev0/environment.yaml | 2 +- coffea-dask/Dockerfile.alma8 | 4 ++-- coffea-dask/Dockerfile.ubuntu | 4 ++-- coffea-dask/environment.yaml | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/gh-ci.yaml b/.github/workflows/gh-ci.yaml index 7b4cbcb..b0fc51d 100644 --- a/.github/workflows/gh-ci.yaml +++ b/.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 }} diff --git a/.github/workflows/watch-conda.yaml b/.github/workflows/watch-conda.yaml index 40b8d50..afb3bf9 100644 --- a/.github/workflows/watch-conda.yaml +++ b/.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,7 +26,7 @@ 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/gha-find-replace@2.0.0 with: find: ${{ steps.current_version.outputs.env_releasev0 }} @@ -34,7 +34,7 @@ jobs: 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/gha-find-replace@2.0.0 with: find: ${{ steps.current_version.outputs.env_release }} diff --git a/coffea-basev0/Dockerfile.alma8 b/coffea-basev0/Dockerfile.alma8 index 28f3f6d..f99af1f 100644 --- a/coffea-basev0/Dockerfile.alma8 +++ b/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 diff --git a/coffea-basev0/Dockerfile.ubuntu b/coffea-basev0/Dockerfile.ubuntu index cd9dc6f..bc4e479 100644 --- a/coffea-basev0/Dockerfile.ubuntu +++ b/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 diff --git a/coffea-basev0/environment.yaml b/coffea-basev0/environment.yaml index 175ec2b..53218f7 100644 --- a/coffea-basev0/environment.yaml +++ b/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 diff --git a/coffea-dask/Dockerfile.alma8 b/coffea-dask/Dockerfile.alma8 index 98fcac2..6cc7780 100644 --- a/coffea-dask/Dockerfile.alma8 +++ b/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 diff --git a/coffea-dask/Dockerfile.ubuntu b/coffea-dask/Dockerfile.ubuntu index 73158f7..d61021d 100644 --- a/coffea-dask/Dockerfile.ubuntu +++ b/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 diff --git a/coffea-dask/environment.yaml b/coffea-dask/environment.yaml index 9c7dc83..adade50 100644 --- a/coffea-dask/environment.yaml +++ b/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