Merge pull request #14 from devilbox/actions

Unify workflows
devilbox · Mar 6, 2022 · 91e4663 · 91e4663
2 parents 9dfc5d4 + 57654fb
commit 91e4663
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 31 deletions.
diff --git a/.github/workflows/action_branch.yml b/.github/workflows/action_branch.yml
@@ -10,13 +10,8 @@ name: build
 # When to run
 # -------------------------------------------------------------------------------------------------
 on:
-  # Runs after merge to master and after tag creation
   push:
-    branches:
-      - master
-      - release-*
-    tags:
-      - '*'
+
 
 jobs:
 
@@ -30,7 +25,7 @@ jobs:
     uses: devilbox/github-actions/.github/workflows/docker-name-version-arch.yml@master
     with:
       enabled: true
-      can_deploy: true
+      can_deploy: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/release-') }}
       name: ${{ needs.params.outputs.name }}
       matrix: ${{ needs.params.outputs.matrix }}
       refs: ${{ needs.params.outputs.refs }}

diff --git a/.github/workflows/action_pull_request.yml b/.github/workflows/action_pull_request.yml
@@ -10,15 +10,16 @@ name: build
 # When to run
 # -------------------------------------------------------------------------------------------------
 on:
-  # Runs on Pull Requests
-  pull_request_target:
+  pull_request:
 
 
 jobs:
 
   # (1/2) Determine repository params
   params:
     uses: ./.github/workflows/params.yml
+    # Only run for forks (contributor)
+    if: github.event.pull_request.head.repo.fork
 
   # (2/2) Build
   docker:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -11,28 +11,12 @@ name: lint
 # -------------------------------------------------------------------------------------------------
 on:
   # Runs on Pull Requests
-  pull_request_target:
+  pull_request:
 
 
 # -------------------------------------------------------------------------------------------------
 # What to run
 # -------------------------------------------------------------------------------------------------
 jobs:
   lint:
-    name: "Lint"
-    runs-on: ubuntu-latest
-    steps:
-      # ------------------------------------------------------------
-      # Setup repository
-      # ------------------------------------------------------------
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      # ------------------------------------------------------------
-      # Lint repository
-      # ------------------------------------------------------------
-      - name: Lint
-        run: |
-          make lint
+    uses: devilbox/github-actions/.github/workflows/lint-generic.yml@master
diff --git a/tests/00-entrypoint.sh b/tests/00-entrypoint.sh
@@ -10,7 +10,7 @@ TAG="${3}"
 #ARCH="${4}"
 
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
-# shellcheck disable=SC1090
+# shellcheck disable=SC1091
 . "${CWD}/.lib.sh"
 
 # Ensure they all have a common entrypoint

diff --git a/tests/01-version.sh b/tests/01-version.sh
@@ -10,7 +10,7 @@ TAG="${3}"
 ARCH="${4}"
 
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
-# shellcheck disable=SC1090
+# shellcheck disable=SC1091
 . "${CWD}/.lib.sh"
 
 

diff --git a/tests/02-mysqli.sh b/tests/02-mysqli.sh
@@ -11,7 +11,7 @@ ARCH="${4}"
 SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
 
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
-# shellcheck disable=SC1090
+# shellcheck disable=SC1091
 . "${CWD}/.lib.sh"
 
 

diff --git a/tests/03-config.sh b/tests/03-config.sh
@@ -11,7 +11,7 @@ TAG="${3}"
 ARCH="${4}"
 
 CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
-# shellcheck disable=SC1090
+# shellcheck disable=SC1091
 . "${CWD}/.lib.sh"