Merge branch 'main' into python-conda-staging

GEO-BON · Dec 17, 2024 · bcd26ac · bcd26ac
2 parents 3f23157 + 570bc84
commit bcd26ac
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 7 deletions.
diff --git a/.github/workflows/docker_runner-conda.yml b/.github/workflows/docker_runner-conda.yml
@@ -5,9 +5,11 @@ on:
   push:
     branches:
       - main
+      - '**staging'
     paths:
       - 'runners/conda-dockerfile'
       - 'runners/r-environment.yml'
+      - 'runners/python-environment.yml'
       - 'runners/.condarc'
 
 jobs:
@@ -23,8 +25,9 @@ jobs:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
 
-    - name: Extract metadata (tags, labels) for Docker
-      id: meta
+    - name: Extract metadata (tags, labels) for Docker, main branch
+      if: github.ref == 'refs/heads/main'
+      id: metadata-main
       uses: docker/metadata-action@v4
       with:
         images: geobon/bon-in-a-box
@@ -34,6 +37,16 @@ jobs:
           # In case we want to replicate a specific legacy setup
           type=sha,prefix=runner-conda-
 
+    - name: Extract metadata (tags, labels) for Docker, staging branch
+      if: github.ref != 'refs/heads/main'
+      id: metadata-staging
+      uses: docker/metadata-action@v4
+      with:
+        images: geobon/bon-in-a-box
+        tags: |
+          # Image used in compose file
+          type=raw,value=runner-conda-${{github.ref_name}}
+
     - name: Build and push Docker image
       uses: docker/build-push-action@v3
       with:

diff --git a/.github/workflows/docker_runner-julia.yml b/.github/workflows/docker_runner-julia.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - main
+      - '**staging'
     paths:
       - 'runners/julia-dockerfile'
 
@@ -14,14 +15,15 @@ jobs:
     steps:
     - name: Check out the repo
       uses: actions/checkout@v3
-    
+
     - name: Log in to Docker Hub
       uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Extract metadata (tags, labels) for Docker
+
+    - name: Extract metadata (tags, labels) for Docker, main branch
+      if: github.ref == 'refs/heads/main'
       id: meta
       uses: docker/metadata-action@v4
       with:
@@ -31,7 +33,17 @@ jobs:
           type=raw,value=runner-julia
           # In case we want to replicate a specific legacy setup
           type=sha,prefix=runner-julia-
-    
+
+    - name: Extract metadata (tags, labels) for Docker, staging branch
+      if: github.ref != 'refs/heads/main'
+      id: metadata-staging
+      uses: docker/metadata-action@v4
+      with:
+        images: geobon/bon-in-a-box
+        tags: |
+          # Image used in compose file
+          type=raw,value=runner-julia-${{github.ref_name}}
+
     - name: Build and push Docker image
       uses: docker/build-push-action@v3
       with:
@@ -40,4 +52,4 @@ jobs:
         push: true
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
-  
+