Merge pull request #156 from nugit/develop

27 May 2024 Release

.github/dependabot.yml

@@ -1,35 +1,29 @@
 version: 2
 
 updates:
-# root
-  - package-ecosystem: "npm"
-    directory: "/"
+  - package-ecosystem: 'npm'
+    directory: '/'
     schedule:
-      interval: "weekly"
-      day: "monday"
-      time: "22:00"
+      interval: 'weekly'
+      day: 'monday'
+      time: '22:00'
     allow:
-      - dependency-type: "direct"
-    reviewers:
-      - team-engineering-x
-    target-branch: "develop"
+      - dependency-type: 'direct'
+    target-branch: 'develop'
     commit-message:
-      prefix: "fix:"
-      prefix-development: "chore:"
-    versioning-strategy: increase-if-necessary
+      prefix: 'fix:'
+      prefix-development: 'chore:'
+    versioning-strategy: increase
     ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-major"]
+      - dependency-name: '*'
+        update-types: ['version-update:semver-major']
 
-# github actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
+  - package-ecosystem: 'github-actions'
+    directory: '/'
     schedule:
-      interval: "weekly"
-      day: "monday"
-      time: "22:00"
-    reviewers:
-      - team-engineering-x
-    target-branch: "develop"
+      interval: 'weekly'
+      day: 'monday'
+      time: '22:00'
+    target-branch: 'develop'
     commit-message:
-      prefix: "chore:"
+      prefix: 'chore:'

.github/workflows/changelog.yml

@@ -9,7 +9,9 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: nugit/[email protected]
+      - uses: actions/checkout@v4
+      - uses: nugit/[email protected]
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           type: release
+          base: master

.github/workflows/create-release.yml

@@ -1,18 +1,19 @@
 name: Create Release
 
 on:
-  schedule:
-    - cron: '* * 1 * *'
+  push:
+    branches:
+      - 'develop'
 
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.4.0
-      - uses: nugit/actions-pr-changelog/createReleaseAction@v1.2.6
+      - uses: actions/checkout@v4
+      - uses: nugit/actions-pr-changelog/createReleaseAction@v3.1.0
         with:
           token: ${{ secrets.GH_TOKEN }}
           head: develop
           base: master
           title: Next Release
-          reviewers: 'moroine,limtingzhi,tuannugit'
+          reviewers: 'limtingzhi'

.github/workflows/dependabot.yml

@@ -1,12 +1,23 @@
-name: dependabot-check
+name: dependabot
 
 on:
   pull_request:
 
-# See https://github.com/dependabot/dependabot-core/issues/3253#issuecomment-852541544
 jobs:
-  check-dependabot:
+  auto-merge:
     runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
-      - run: echo "PR created by Dependabot"
+      - uses: fastify/github-action-merge-dependabot@v3
+        with:
+          target: minor
+          merge-method: merge
+          use-github-auto-merge: true
+          github-token: ${{ secrets.GH_TOKEN }}
+  auto-approve:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    needs: auto-merge
+    if: contains(github.head_ref, 'dependabot')
+    steps:
+      - uses: hmarr/auto-approve-action@v3

.github/workflows/deploy-client.yml

@@ -0,0 +1,36 @@
+name: Deploy
+
+on:
+  workflow_call:
+    secrets:
+      GH_TOKEN:
+        required: true
+      NPM_TOKEN:
+        required: true
+      SLACK_WEBHOOK:
+        required: true
+
+jobs:
+  install:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GH_TOKEN }}
+      - run: |
+          git config user.name github-actions
+          git config user.email [email protected]
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '16'
+          cache: 'npm'
+      - run: echo '//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}' > .npmrc
+      - run: npm ci
+      # https://github.com/dhoulb/multi-semantic-release#npm-v85-npm-err-notarget-no-matching-version-found-for
+      - run: npm config set workspaces-update false
+      - name: publish
+        run: npm run deploy:client
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/deploy-production.yml

@@ -10,29 +10,14 @@ jobs:
     needs: deploy
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.4.0
+      - uses: actions/checkout@v4
       - name: Merge master -> develop
         uses: devmasx/[email protected]
         with:
           type: now
           from_branch: master
           target_branch: develop
           github_token: ${{ secrets.GH_TOKEN }}
-  deploy: # Runs install once before everything to create & save cache
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/[email protected]
-        with:
-          token: ${{ secrets.GH_TOKEN }}
-      - uses: actions/[email protected]
-        with:
-          node-version: '14'
-          cache: 'yarn'
-      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
-      - run: yarn install
-      - name: publish
-        run: yarn deploy:client
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+  deploy:
+    uses: ./.github/workflows/deploy-client.yml
+    secrets: inherit

.github/workflows/deploy-staging.yml

@@ -7,21 +7,6 @@ on:
       - develop
 
 jobs:
-  install: # Runs install once before everything to create & save cache
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/[email protected]
-        with:
-          token: ${{ secrets.GH_TOKEN }}
-      - uses: actions/[email protected]
-        with:
-          node-version: '14'
-          cache: 'yarn'
-      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
-      - run: yarn install
-      - name: publish
-        run: yarn deploy:client
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+  deploy:
+    uses: ./.github/workflows/deploy-client.yml
+    secrets: inherit

.github/workflows/push.yml

@@ -5,25 +5,8 @@ name: Check
 
 on:
   push:
-    branches:
-      - "master"
-      - "develop"
-  pull_request:
 
 jobs:
   check:
-    runs-on: ubuntu-latest
-    steps:
-      - if: ${{ github.actor == 'dependabot[bot]' }}
-        run: echo "Skipping - Will be tested in dependabot-merge"
-      - uses: actions/[email protected]
-        if: ${{ github.actor != 'dependabot[bot]' }}
-      - uses: actions/[email protected]
-        if: ${{ github.actor != 'dependabot[bot]' }}
-        with:
-          node-version: '14'
-          cache: 'yarn'
-      - run: yarn install
-        if: ${{ github.actor != 'dependabot[bot]' }}
-      - run: yarn lint
-        if: ${{ github.actor != 'dependabot[bot]' }}
+    uses: ./.github/workflows/test.yml
+    secrets: inherit

.github/workflows/test.yml

@@ -0,0 +1,22 @@
+name: Test
+
+on:
+  workflow_call:
+    secrets:
+      NPM_TOKEN:
+        required: true
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      statuses: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '16'
+          cache: 'npm'
+      - run: npm ci
+      - run: npm run lint

.gitignore

@@ -2,3 +2,5 @@
 node_modules/
 
 .npmrc
+
+.DS_Store

.husky/commit-msg

@@ -6,4 +6,4 @@ if [[ -n $HUSKY_BYPASS ]]; then
   exit 0;
 fi
 
-yarn commitlint --config ./config/commitlint.config.js --edit $1
+npx commitlint --config ./config/commitlint.config.js --edit $1