Merge branch 'main' into develop

lexicongovernance · Jan 26, 2024 · 2056873 · 2056873
2 parents 9f74304 + a504051
commit 2056873
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml
@@ -2,7 +2,7 @@ name: Check Formatting
 
 on:
   push:
-    branches: [main, develop]
+    branches: [main, develop, next]
   pull_request:
     types: [opened, synchronize]
 

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -46,14 +46,20 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.REGISTRY_PATH }}/${{ env.SERVICE_NAME }}
 
-      # https://github.com/docker/build-push-action
-      - name: Build and push Docker image
-        id: build-and-push
+      - name: Build and push Docker image with version and commit tags
+        id: build-and-push-version-commit
         uses: docker/build-push-action@v2
         with:
           context: .
           push: true
           tags: |
             ${{ env.REGISTRY }}/${{ env.REGISTRY_PATH }}/${{ env.SERVICE_NAME }}:${{ steps.pkg.outputs.version }}
             ${{ env.REGISTRY }}/${{ env.REGISTRY_PATH }}/${{ env.SERVICE_NAME }}:commit-${{ github.sha }}
-            ${{ github.ref == 'refs/heads/main' && env.REGISTRY }}/${{ env.REGISTRY_PATH }}/${{ env.SERVICE_NAME }}:latest || '' }}
+
+      - name: Build and push Docker image with latest tag
+        if: github.ref == 'refs/heads/main'
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.REGISTRY_PATH }}/${{ env.SERVICE_NAME }}:latest
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -2,7 +2,7 @@ name: Linting
 
 on:
   push:
-    branches: [main, develop]
+    branches: [main, develop, next]
   pull_request:
     types: [opened, synchronize]