From 1fa5050a2fbe5e87d57f550ac0ff82bd7e21b878 Mon Sep 17 00:00:00 2001
From: Oksana Shadura <ksu.shadura@gmail.com>
Date: Fri, 16 Feb 2024 10:10:53 +0100
Subject: [PATCH] Rename coffea-basev0 as acoffea-base (we are going to reuse
 existing repository in dockerhub)

---
 .github/workflows/gh-ci.yaml                   | 18 +++++++++---------
 .../Dockerfile.almalinux8                      |  0
 .../Dockerfile.ubuntu                          |  0
 .../environment.yaml                           |  0
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename {coffea-basev0 => coffea-base}/Dockerfile.almalinux8 (100%)
 rename {coffea-basev0 => coffea-base}/Dockerfile.ubuntu (100%)
 rename {coffea-basev0 => coffea-base}/environment.yaml (100%)

diff --git a/.github/workflows/gh-ci.yaml b/.github/workflows/gh-ci.yaml
index 1952c74..1877f80 100644
--- a/.github/workflows/gh-ci.yaml
+++ b/.github/workflows/gh-ci.yaml
@@ -23,13 +23,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image_dir: [coffea-basev0, coffea-dask]
+        image_dir: [coffea-base, coffea-dask]
         distro: [almalinux8]
         python: ["3.9", "3.10", "3.11"]
         exclude:
           - distro: almalinux8
             python: 3.9
-          - distro: coffea-basev0
+          - distro: coffea-base
             python: 3.11
     name: ${{ matrix.image_dir }}-${{ matrix.distro }}-${{ matrix.python }}
     runs-on: ubuntu-latest
@@ -73,7 +73,7 @@ jobs:
       run: |
         image="coffeateam/${image_dir}-${distro}"
         
-        if [ ${image_dir} == 'coffea-basev0' ]; then
+        if [ ${image_dir} == 'coffea-base' ]; then
           tag="${image}:${releasev0}-py${python}"
         else
           tag="${image}:${release}-py${python}"
@@ -89,7 +89,7 @@ jobs:
         echo "::set-output name=tags::${tags}"
 
     - name: Build base v0
-      if: ${{ matrix.image_dir == 'coffea-basev0' }}
+      if: ${{ matrix.image_dir == 'coffea-base' }}
       uses: docker/build-push-action@v5
       with:
         load: true
@@ -101,7 +101,7 @@ jobs:
           releasev0=${{ env.releasev0 }}
 
     - name: Build base v1
-      if: ${{ matrix.image_dir != 'coffea-basev0' }}
+      if: ${{ matrix.image_dir != 'coffea-base' }}
       uses: docker/build-push-action@v5
       with:
         load: true
@@ -132,7 +132,7 @@ jobs:
 #        fi
 
     - name: Test Pytest environement v0
-      if: ${{ matrix.image_dir == 'coffea-basev0' }}
+      if: ${{ matrix.image_dir == 'coffea-base' }}
       env:
         tag: ${{ steps.tags.outputs.tag }}
       run: |
@@ -140,7 +140,7 @@ jobs:
         sh -c "pip install -U pytest && cd tmp/workspace && pytest -m v0"
 
     - name: Test Pytest environement CalVer
-      if: ${{ matrix.image_dir != 'coffea-basev0' }}
+      if: ${{ matrix.image_dir != 'coffea-base' }}
       env:
         tag: ${{ steps.tags.outputs.tag }}
       run: |
@@ -149,7 +149,7 @@ jobs:
 
 
     - name: Build and push v0
-      if: ${{ matrix.image_dir != 'coffea-basev0' }}
+      if: ${{ matrix.image_dir != 'coffea-base' }}
       uses: docker/build-push-action@v5
       with:
         platforms: linux/amd64
@@ -162,7 +162,7 @@ jobs:
           release=${{ env.release }}
 
     - name: Build and push v1
-      if: ${{ matrix.image_dir == 'coffea-basev0' }}
+      if: ${{ matrix.image_dir == 'coffea-base' }}
       uses: docker/build-push-action@v5
       with:
         platforms: linux/amd64
diff --git a/coffea-basev0/Dockerfile.almalinux8 b/coffea-base/Dockerfile.almalinux8
similarity index 100%
rename from coffea-basev0/Dockerfile.almalinux8
rename to coffea-base/Dockerfile.almalinux8
diff --git a/coffea-basev0/Dockerfile.ubuntu b/coffea-base/Dockerfile.ubuntu
similarity index 100%
rename from coffea-basev0/Dockerfile.ubuntu
rename to coffea-base/Dockerfile.ubuntu
diff --git a/coffea-basev0/environment.yaml b/coffea-base/environment.yaml
similarity index 100%
rename from coffea-basev0/environment.yaml
rename to coffea-base/environment.yaml