Merge pull request #25 from wayofdev/feat/refactor

Author: lotyp

.github/workflows/build-latest.yml

@@ -2,9 +2,6 @@
 
 on:  # yamllint disable-line rule:truthy
   workflow_dispatch:
-  push:
-    branches:
-      - master
   pull_request:
     branches:
       - master
@@ -18,7 +15,8 @@ jobs:
     outputs:
       matrix: ${{ steps.matrix.outputs.matrix }}
     steps:
-      - id: matrix
+      - name: ⚙️ Generate matrix
+        id: matrix
         run: |
           echo 'matrix={
             "os_name": ["alpine"],
@@ -33,8 +31,9 @@ jobs:
     uses: wayofdev/gh-actions/.github/workflows/build-image.yml@master
     with:
       os: "ubuntu-latest"
-      push-to-hub: ${{ github.event_name != 'pull_request' }}
+      push-to-hub: true
       image-namespace: "wayofdev/php-base"
+      image-template-path: "./dist/base"
       image-template: ${{ matrix.php_version }}-${{ matrix.php_type }}-${{ matrix.os_name }}
       image-version: latest
     secrets:

.github/workflows/build-release.yml

@@ -13,6 +13,7 @@ jobs:
     runs-on: "ubuntu-latest"
     outputs:
       matrix: ${{ steps.matrix.outputs.matrix }}
+      version: ${{ steps.version.outputs.version }}
     steps:
       - name: ⚙️ Generate matrix
         id: matrix
@@ -26,7 +27,9 @@ jobs:
       - name: ⚙️ Get version for image tag
         id: version
         run: |
-          echo "version=$(echo ${GITHUB_REF#refs/*/} | cut -c 2-)" >> $GITHUB_OUTPUT
+          version=${{ github.ref_name }}
+          version=${version#v}
+          echo "version=$version" >> $GITHUB_OUTPUT
 
   build:
     needs: prepare
@@ -37,6 +40,7 @@ jobs:
       os: "ubuntu-latest"
       push-to-hub: true
       image-namespace: "wayofdev/php-base"
+      image-template-path: "./dist/base"
       image-template: ${{ matrix.php_version }}-${{ matrix.php_type }}-${{ matrix.os_name }}
       image-version: ${{ needs.prepare.outputs.version }}
     secrets: