Merge branch 'dev' of https://github.com/gleanerio/gleaner into dev_ec

gleanerio · Jul 19, 2023 · 49aba64 · 49aba64
2 parents c14eccc + 6a4d814
commit 49aba64
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/docker_glcon.yml b/.github/workflows/docker_glcon.yml
@@ -6,7 +6,7 @@ on:
     branches:
       - master
       - dev_docker_glcon
-      - dev_docker_multipleimage
+      - dev
     tags:
       - v3.*
   release:
@@ -162,4 +162,4 @@ jobs:
       -
         name: Inspect image
         run: |
-          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
diff --git a/.github/workflows/docker_gleaner.yml b/.github/workflows/docker_gleaner.yml
@@ -6,7 +6,7 @@ on:
     branches:
       - master
       - dev_ec
-      - dev_docker_multipleimage
+      - dev
     tags:
       - v3.*
   release:
@@ -177,4 +177,4 @@ jobs:
       -
         name: Inspect image
         run: |
-          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}