Merge pull request #11 from wayofdev/develop

wayofdev · May 18, 2023 · aa69c14 · aa69c14
2 parents 06434d5 + d4aaa2f
commit aa69c14
Show file tree

Hide file tree

Showing 21 changed files with 527 additions and 289 deletions.
diff --git a/.github/workflows/label.yml → .github/workflows/apply-labels.yml b/.github/workflows/label.yml → .github/workflows/apply-labels.yml
@@ -1,8 +1,10 @@
+---
+
 # This workflow will triage pull requests and apply a label based on the
 # paths that are modified in the pull request.
 #
 # To use this workflow, you will need to set up a .github/labeler.yml
-# file with configuration.  For more information, see:
+# file with configuration. For more information, see:
 # https://github.com/actions/labeler/blob/master/README.md
 
 on:  # yamllint disable-line rule:truthy
@@ -12,11 +14,10 @@ name: 🏷️ Add labels
 
 jobs:
   label:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 🏷️ Apply labels
-        uses: actions/labeler@v4
-        with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+    uses: wayofdev/gh-actions/.github/workflows/apply-labels.yml@master
+    with:
+      os: ubuntu-latest
+    secrets:
+      token: ${{ secrets.GITHUB_TOKEN }}
 
 ...
diff --git a/.github/workflows/auto-merge-release.yaml b/.github/workflows/auto-merge-release.yaml
@@ -13,15 +13,14 @@ name: 🤞 Auto merge release
 
 jobs:
   auto-merge:
-    if: github.actor == 'lotyp' && startsWith(github.head_ref, 'release-please--')
-    runs-on: ubuntu-latest
-    steps:
-      - name: 🤞 Auto-merge pull request
-        uses: peter-evans/enable-pull-request-automerge@v3
-        with:
-          pull-request-number: ${{ github.event.pull_request.number }}
-          merge-method: merge
-          # to trigger other workflows, pass PAT token instead of GITHUB_TOKEN
-          token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
+    uses: wayofdev/gh-actions/.github/workflows/auto-merge-release.yml@master
+    with:
+      os: ubuntu-latest
+      pull-request-number: ${{ github.event.pull_request.number }}
+      actor: lotyp
+      merge-method: merge
+    secrets:
+      # to trigger other workflows, pass PAT token instead of GITHUB_TOKEN
+      token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
 
 ...
diff --git a/.github/workflows/codesee-arch-diagram.yml → .github/workflows/create-arch-diagram.yml b/.github/workflows/codesee-arch-diagram.yml → .github/workflows/create-arch-diagram.yml
@@ -1,8 +1,9 @@
 ---
+
 # This workflow was added by CodeSee. Learn more at https://codesee.io/
 # This is v2.0 of this workflow file
 
-on: # yamllint disable-line rule:truthy
+on:  # yamllint disable-line rule:truthy
   push:
     branches:
       - develop
@@ -18,10 +19,11 @@ permissions: read-all
 
 jobs:
   codesee:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-      - name: 💻 Analyze the repo with CodeSee
-        uses: Codesee-io/codesee-action@v2
-        with:
-          codesee-token: ${{ secrets.CODESEE_ARCH_DIAG_API_TOKEN }}
+    uses: wayofdev/gh-actions/.github/workflows/create-arch-diagram.yml@master
+    with:
+      os: ubuntu-latest
+      continue-on-error: true
+    secrets:
+      codesee-token: ${{ secrets.CODESEE_ARCH_DIAG_API_TOKEN }}
+
+...
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -17,6 +17,7 @@ jobs:
       os: ubuntu-latest
       branch: master
       package-name: laravel-cycle-starter-tpl
+    secrets:
       token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
 
 ...
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
@@ -10,17 +10,11 @@ permissions:
 
 jobs:
   shellcheck:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 📦 Check out the codebase
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: 🐞 Differential shell-check
-        uses: redhat-plumbers-in-action/differential-shellcheck@v4
-        with:
-          severity: warning
-          token: ${{ secrets.GITHUB_TOKEN }}
+    uses: wayofdev/gh-actions/.github/workflows/shellcheck.yml@master
+    with:
+      os: ubuntu-latest
+      severity: warning
+    secrets:
+      token: ${{ secrets.GITHUB_TOKEN }}
 
 ...
diff --git a/Makefile b/Makefile
@@ -124,7 +124,7 @@ prepare:
 # ------------------------------------------------------------------------------------
 up: # Creates and starts containers, defined in docker-compose and override file
 	$(DOCKER_COMPOSE) up --remove-orphans -d
-	$(DOCKER_COMPOSE) exec app wait4x tcp database:5432 -t 1m
+	$(DOCKER_COMPOSE) exec app wait4x postgresql 'postgres://${DB_USERNAME}:${DB_PASSWORD}@database:5432/${DB_DATABASE}?sslmode=disable' -t 1m
 .PHONY: up
 
 down: # Stops and removes containers of this project