Merge pull request #12 from wayofdev/feat/updates

.github/labeler.yml

@@ -9,7 +9,6 @@
   - ./*.md
 
 "type: maintenance":
-  - .dependabot/*
   - .github/workflows/*
   - app/tests/**/*
   - tests/**/*

.github/workflows/auto-merge-release.yaml

@@ -0,0 +1,27 @@
+---
+
+# https://github.com/peter-evans/enable-pull-request-automerge
+
+on:  # yamllint disable-line rule:truthy
+  pull_request:
+
+permissions:
+  pull-requests: write
+  contents: write
+
+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@v2
+        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 }}
+
+...

.github/workflows/ci.yml

@@ -1,7 +1,5 @@
 ---
 
-name: CI
-
 on:  # yamllint disable-line rule:truthy
   push:
     branches:
@@ -18,39 +16,43 @@ on:  # yamllint disable-line rule:truthy
     # Every Sunday at 05:10
     - cron: '10 5 * * 0'
 
+name: 🔍 Continuous integration
+
 jobs:
   build:
-    name: Build
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix:
-        os_name: ['alpine']
     steps:
-      - uses: e1himself/[email protected]
+      - name: 📦 Install goss
+        uses: e1himself/[email protected]
 
-      - name: Checkout
-        uses: actions/[email protected]
+      - name: 📦 Check out the codebase
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
       ### For Cross Platform OSX builds uncomment these lines
-      - name: Set up QEMU
+      - name: 🖥️ Set up QEMU
         uses: docker/setup-qemu-action@v2
         with:
           platforms: arm64
 
-      - name: Set up Docker Buildx
+      - name: 🚀 Set up Docker BuildX
         uses: docker/setup-buildx-action@v2
         with:
           install: true
 
-      - name: Prepare environment
+      - name: 🛠️ Prepare environment
         run: |
           docker network create ss_network
           make env
         env:
           COMPOSE_PROJECT_NAME: wod
 
-      - name: Run dcgoss tests
+      - name: 🧪 Run dcgoss tests
         run: |
           docker network create shared
           make test
+
+...

.github/workflows/release-please.yml → .github/workflows/create-release.yml

@@ -7,13 +7,14 @@ on:  # yamllint disable-line rule:truthy
     branches:
       - master
 
-name: Release please
+name: 📦 Create release
 
 jobs:
-  release-please:
+  release:
     runs-on: ubuntu-latest
     steps:
-      - uses: google-github-actions/release-please-action@v3
+      - name: 🎉 Create release
+        uses: google-github-actions/release-please-action@v3
         id: release
         with:
           token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}

.github/workflows/label.yml

@@ -1,22 +1,20 @@
----
-
 # 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:
 # https://github.com/actions/labeler/blob/master/README.md
 
-name: Add labels
-
 on:  # yamllint disable-line rule:truthy
   pull_request:
 
+name: 🏷️ Add labels
+
 jobs:
   label:
     runs-on: ubuntu-latest
     steps:
-      - name: Apply labels
+      - name: 🏷️ Apply labels
         uses: actions/labeler@v4
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/shellcheck.yml

@@ -1,25 +1,24 @@
 ---
 
-name: Differential shell-check
-
 on:  # yamllint disable-line rule:truthy
   pull_request:
 
+name: 🐞 Differential shell-check
+
 permissions:
   contents: read
 
 jobs:
   shellcheck:
     runs-on: ubuntu-latest
-
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3.1.0
+      - name: 📦 Check out the codebase
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: Differential ShellCheck
-        uses: redhat-plumbers-in-action/differential-shellcheck@latest
+      - name: 🐞 Differential shell-check
+        uses: redhat-plumbers-in-action/differential-shellcheck@v4
         with:
           severity: warning
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sync-from-tpl.yml

@@ -1,28 +1,30 @@
 ---
 
-name: Sync changes from upstream template
-
 on:  # yamllint disable-line rule:truthy
   # Trigger At 00:00 on each 1st day of month
   schedule:
     - cron:  "0 0 1 * *"
   # Manual trigger
   workflow_dispatch:
 
+name: ♻️ Sync changes from upstream template
+
 jobs:
   repo-sync:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3.1.0
+      - name: 📦 Check out the codebase
+        uses: actions/checkout@v3
         with:
           token: ${{ secrets.WORKFLOW_TOKEN }}
 
-      - name: Sync changes from upstream template
-        uses: AndreasAugustin/actions-template-sync@v0.4.2-draft
+      - name: ♻️ Sync changes from upstream template
+        uses: AndreasAugustin/actions-template-sync@v0.7.3
         with:
           github_token: ${{ secrets.WORKFLOW_TOKEN }}
           source_repo_path: wayofdev/docker-project-services
           upstream_branch: master
           pr_labels: "type: maintenance"
+
+...

.pre-commit-config.yaml

@@ -2,17 +2,22 @@
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: fix-encoding-pragma
 
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: v2.37.0
+    rev: v2.42.1
     hooks:
       - id: commitizen
         stages:
           - commit-msg
 
+  - repo: https://github.com/rhysd/actionlint
+    rev: v1.6.23
+    hooks:
+      - id: actionlint
+
 ...

Makefile

@@ -79,7 +79,7 @@ help:
 	@echo '    🏢 ${YELLOW}Org                     wayofdev (github.com/wayofdev)${RST}'
 .PHONY: help
 
-all: env mkcert up
+all: hooks env mkcert up
 PHONY: all