ci: refactored actions config

vhs · Jun 25, 2024 · f188b50 · f188b50
1 parent 17045b4
commit f188b50
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 33 deletions.
diff --git a/.github/workflows/docker-build-only.yml b/.github/workflows/docker-build-only.yml
diff --git a/.github/workflows/docker-build-push.yml → .github/workflows/docker-image.yml b/.github/workflows/docker-build-push.yml → .github/workflows/docker-image.yml
@@ -2,26 +2,35 @@ name: Docker Image CI
 
 on:
   push:
-    branches: ["main", "master", "trunk"]
-    tags: ["v*"]
+    branches:
+      - 'main'
+      - 'master'
+      - 'trunk'
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - 'main'
+      - 'master'
+      - 'trunk'
+  workflow_dispatch:
 
 jobs:
-  build-push:
-    if: ${{ github.event_name != 'pull_request' }}
-
+  docker:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Docker metadata
+      - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: ${{ vars.DOCKERHUB_TEMPLATE }}
 
       - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}