☁️ chore(automation): Applying changes from upstream repository.

ProfessorManhattan · Nov 19, 2022 · 8cc3cc9 · 8cc3cc9
1 parent e915db9
commit 8cc3cc9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 82 deletions.
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -1,6 +1,5 @@
 ---
 version: '3'
-
 includes:
   ansible:
     taskfile: ./.config/taskfiles/ansible/Taskfile.yml
@@ -185,7 +184,6 @@ includes:
   localhost:
     taskfile: ../Taskfile-localhost.yml
     optional: true
-
   log:
     optional: true
     taskfile: ./.config/taskfiles/log/Taskfile.yml
@@ -316,7 +314,6 @@ includes:
     taskfile: ./.config/taskfiles/web/Taskfile-profile.yml
     optional: true
 output: interleaved
-
 vars:
   DOCKERHUB_PROFILE:
     sh: |
@@ -369,11 +366,7 @@ vars:
   GROUP_EXEC_ASYNC: 'false'
   # yamllint disable rule:line-length
   IGNORE_FOLDERS: >-
-    -path './.autodoc/*' -o -path './.cache/*' -o -path './.common*' -o -path './.config/*' -o -path './.git/*' -o
-    -path './.modules/*' -o -path './.npm/*' -o
-    -path './.pnpm-store/*' -o -path './.shared/*' -o -path './.task/*' -o -path './.venv/*' -o -path './.vscode/*' -o
-    -path './build/*' -o -path './dist/*' -o -path './node_modules/*' -o -path './roles/*' -o -name pnpm-lock.yaml -o
-    -name package-lock.json -o -name poetry.lock -o -name '.variables.json' -o -name '.git'
+    -path './.autodoc/*' -o -path './.cache/*' -o -path './.common*' -o -path './.config/*' -o -path './.git/*' -o -path './.modules/*' -o -path './.npm/*' -o -path './.pnpm-store/*' -o -path './.shared/*' -o -path './.task/*' -o -path './.venv/*' -o -path './.vscode/*' -o -path './build/*' -o -path './dist/*' -o -path './node_modules/*' -o -path './roles/*' -o -name pnpm-lock.yaml -o -name package-lock.json -o -name poetry.lock -o -name '.variables.json' -o -name '.git'
   INIT_SCRIPT: https://gitlab.com/megabyte-labs/gitlab-ci/-/raw/master/scripts/update-init.sh
   LOG_FIX:
     sh: chmod +x .config/log
@@ -405,34 +398,13 @@ vars:
       fi
   PYTHON_VIRTUALENV: true
   REPOSITORY_SUBTYPE:
-    sh: |
-      if [ -n "$REPOSITORY_TYPE" ]; then REPO_SUBTYPE="$REPOSITORY_TYPE"; fi
-      if type jq &> /dev/null && [ -f package.json ]; then
-        VER="$(jq -r '.blueprint.subgroup' package.json)"
-        if [ "$VER" == 'null' ]; then
-          if [ -n "$REPO_SUBTYPE" ]; then echo "$REPO_SUBTYPE"; else echo "misc"; fi
-        else
-          echo "$VER"
-        fi
-      else
-        if [ -n "$REPO_SUBTYPE" ]; then echo "$REPO_SUBTYPE"; else echo "misc"; fi
-      fi
+    sh: if type jq &> /dev/null && [ -f package.json ]; then VER="$(jq -r .blueprint.subgroup package.json)"; if [ "$VER" == null ]; then echo "$REPOSITORY_TYPE"; else echo "$VER"; fi; else echo "$REPOSITORY_TYPE"; fi
   REPOSITORY_TYPE:
-    sh: |
-      if [ -n "$GROUP_TYPE" ]; then REPO_TYPE="$GROUP_TYPE"; fi
-      if type jq &> /dev/null && [ -f package.json ]; then
-        VER="$(jq -r '.blueprint.group' package.json)"
-        if [ "$VER" == 'null' ]; then
-          if [ -n "$REPO_TYPE" ]; then echo "$REPO_TYPE"; else echo "misc"; fi
-        else
-          echo "$VER"
-        fi
-      else
-        if [ -n "$REPO_TYPE" ]; then echo "$REPO_TYPE"; else echo "misc"; fi
-      fi
+    sh: if type jq &> /dev/null && [ -f package.json ]; then VER="$(jq -r .blueprint.group package.json)"; if [ "$VER" == null ]; then echo "$GROUP_TYPE"; else echo "$VER"; fi; else echo "$GROUP_TYPE"; fi
   SEMANTIC_CONFIG: semantic-release-config
   TIMEZONE: America/New_York
-
+  includes:
+    common:start: ./.config/taskfiles/common/Taskfile-start.yml
 env:
   GOPATH:
     sh: |
@@ -465,7 +437,6 @@ env:
       fi
   VOLTA_HOME:
     sh: echo "$HOME/.volta"
-
 profile: |
   if [[ "$OSTYPE" == 'linux-gnu'* ]] || [[ "$OSTYPE" == 'linux-musl'* ]]; then
     if [ -f /home/linuxbrew/.linuxbrew/bin/brew ] && ! type brew > /dev/null; then
@@ -484,7 +455,6 @@ profile: |
   if [ -f .venv/bin/activate ]; then
     . .venv/bin/activate
   fi
-
 tasks:
   build:
     deps:
@@ -513,7 +483,6 @@ tasks:
         else
           [[ $- == *i* ]] && task prepare || (.config/log error '{{.NONINTERACTIVE_MISSING_BUILD_CMD}}' && exit 1)
         fi
-
   clean:
     desc: Removes optional folders that are cached during various tasks
     summary: |
@@ -524,13 +493,11 @@ tasks:
       which will re-generate the project from scratch. Ideally, this task and the reset task
       should never be necessary. The `start` task should be used instead.
     vars:
-      CLEAN_TARGETS: .autodoc .cache .task .venv node_modules tsconfig.tsbuildinfo venv
-        .variables.json
+      CLEAN_TARGETS: .autodoc .cache .task .venv node_modules tsconfig.tsbuildinfo venv .variables.json
     cmds:
       - task: common:clean
         vars:
           CLEAN_TARGETS: '{{.CLEAN_TARGETS}}'
-
   commit:
     desc: Lint staged files, report spelling errors, and open a _required_ commit dialoge
     summary: |
@@ -547,7 +514,6 @@ tasks:
       to your regular `git commit -m` command to bypass the pre-commit hook.
     cmds:
       - task: common:commit
-
   commit:all:
     deps:
       - install:software:git
@@ -585,24 +551,20 @@ tasks:
         git add --all
         git commit
         {{end}}
-
   commit:quick:
     deps:
       - ci:commit:config
     cmds:
       - |
         task --list > /dev/null || (echo "ERROR: Invalid Taskfiles!" && exit 1)
         git add --all
-      - HUSKY=0 git commit -m '🔧 chore(tweak): quick minor update' --no-verify
+      - "HUSKY=0 git commit -m '\U0001F527 chore(tweak)": quick minor update' --no-verify
       - git push origin master
-
   devcontainer:
     deps:
       - install:npm:devcontainer
       - install:software:docker
-
   donothing: 'true'
-
   fix:
     desc: Run code auto-fixers / auto-formatters
     summary: |
@@ -613,7 +575,6 @@ tasks:
       an error so the auto-fixes still have to be validated.
     cmds:
       - task: fix:all
-
   fresh:
     summary: Initialize a new project with only the Taskfile.yml present
     cmds:
@@ -625,7 +586,6 @@ tasks:
       - TMP="$(mktemp)" && jq -r 'del(.blueprint)' package.json > "$TMP" && mv "$TMP" package.json
       - bash start.sh
       - task: prepare
-
   get:links:
     deps:
       - install:software:jq
@@ -638,7 +598,6 @@ tasks:
     cmds:
       - .config/log info 'GitHub -----> `{{.GITHUB_URL}}`'
       - .config/log info 'GitLab -----> `{{.GITLAB_URL}}`'
-
   group:exec:
     desc: Execute group commands on any GitLab group (including repositories in sub-groups)
     summary: |
@@ -659,7 +618,6 @@ tasks:
       Be sure to wrap the command in quotes or you might observe some odd behavior.
     cmds:
       - task: git:gitlab:group:exec
-
   init:
     deps:
       - install:software:jq
@@ -692,12 +650,10 @@ tasks:
       - git init
       - task: repair
       - task: prepare
-
   jumpusb:
     desc: Creates a JumpUSB (https://jumpusb.com)
     cmds:
       - task: install:ventoy
-
   lint:
     desc: Lints the project using all linters
     summary: |
@@ -711,7 +667,6 @@ tasks:
       `task lint`
     cmds:
       - task: lint:all
-
   livereload:
     deps:
       - install:npm:nodemon
@@ -751,12 +706,10 @@ tasks:
           .config/log error '`Taskfile-project.yml` must exist and have a `livereload` task to use with `nodemon`' && exit 1
         fi
       - nodemon --config {{if .CLI_ARGS}}{{.CLI_ARGS}}{{else}}.config/nodemon.json{{end}}
-
   new:project:
     desc: Create a new project
     cmds:
       - task: prepare
-
   preload:
     desc: Set up your workstation in advance by installing commonly used programs
     summary: |
@@ -799,7 +752,6 @@ tasks:
       - task: install:pipx:bundle
       - task: install:python:requirements
       - task: install:modules:local
-
   prepare:
     desc: Prepares the project for the normal start command
     summary: |
@@ -816,7 +768,6 @@ tasks:
     cmds:
       - task: boilerplate:check:package
       - task: boilerplate:clean
-
   publish:
     desc: Publish a semantic release via `semantic-release`
     summary: |
@@ -864,7 +815,6 @@ tasks:
       success: Successfully ran `semantic-release` via `task publish`
     cmds:
       - task: publish:semantic-release
-
   publish:force:
     desc: Force a `semantic-release` even if there are no new eligible commits
     summary: |
@@ -890,10 +840,8 @@ tasks:
       start: Publishing `semantic-release` update via `task publish:force`
       success: Successfully published update via `task publish:force`
     cmds:
-      - |
-        HUSKY=0 git commit -a --allow-empty -m '🔨 chore(bump): Forced semantic-release {{.UPDATE_LEVEL}}' -n
+      - "HUSKY=0 git commit -a --allow-empty -m '\U0001F528 chore(bump): Forced semantic-release {{.UPDATE_LEVEL}}' -n\n"
       - task: publish
-
   pull:upstream:
     desc: Pull from upstream repositories
     summary: |
@@ -910,7 +858,6 @@ tasks:
       success: Successfully pulled from `upstreamRemotes`
     cmds:
       - task: common:update:upstream:remotes:pull
-
   repair:
     cmds:
       - task: common:repair
@@ -921,7 +868,6 @@ tasks:
         else
           curl -sSL {{.INIT_SCRIPT}} > "$TMP" && bash "$TMP" && rm "$TMP"
         fi
-
   reset:
     desc: Resets the project by removing all caches and then re-generating templated files
     summary: |
@@ -933,7 +879,6 @@ tasks:
       updates, it re-generates any templated files.
     cmds:
       - task: common:reset
-
   reset:force:
     desc: 'Aggressively reset the project (**WARNING** This will wipe uncommitted work)'
     summary: |
@@ -952,7 +897,6 @@ tasks:
       answer:
         cmds:
           - task: common:reset:force
-
   scripts:
     interactive: true
     deps:
@@ -970,7 +914,6 @@ tasks:
       start: Running `NTL_RUNNER={{.NPM_PROGRAM}} ntl`
     cmds:
       - NTL_RUNNER={{.NPM_PROGRAM}} ntl
-
   services:
     desc: Update elements of the repository that require API access
     summary: |
@@ -983,7 +926,6 @@ tasks:
       - task: common:update:services
     status:
       - '[ -n "$GITLAB_CI" ] && [ "$REPOSITORY_UPDATE" != "true" ]'
-
   shell:
     desc: Start a terminal session using Docker with any Linux operating system
     compile: |
@@ -1017,13 +959,11 @@ tasks:
       * ubuntu-21.04
     cmds:
       - task: common:shell
-
   ssh-keys:
     deps:
       - cloud:heroku:ssh-keys
       - git:github:ssh-keys
       - git:gitlab:ssh-keys
-
   start:
     desc: Start the project by installing / updating dependencies, repairing issues, and opening a tutorial
     summary: |
@@ -1047,7 +987,6 @@ tasks:
       success: Project started!
     cmds:
       - task: common:start
-
   synchronize:
     desc: Set up the project and refresh it with the latest changes
     summary: |
@@ -1068,7 +1007,6 @@ tasks:
       success: Successfully synchronized the project with upstream file changes and also bootstrapped the project
     cmds:
       - task: upstream:{{.PROJECT_TYPE}}
-
   tag:deps:
     desc: Inject a new command in the `Taskfile.yml` that includes all tasks matching a given tag as deps
     summary: |
@@ -1097,7 +1035,6 @@ tasks:
       ```
     cmds:
       - task: common:util:task:tag:deps
-
   template:
     deps:
       - install:npm:liquidjs
@@ -1119,7 +1056,6 @@ tasks:
     preconditions:
       - sh: test -f .variables.json
         msg: This task requires that you have already spun up the project by running `task start`
-
   test:
     deps:
       - install:software:jq
@@ -1140,7 +1076,6 @@ tasks:
         else
           [[ $- == *i* ]] && task prepare || (.config/log error '{{.NONINTERACTIVE_MISSING_TEST_CMD}}' && exit 1)
         fi
-
   update:
     desc: Fully update the repository
     summary: |
@@ -1167,9 +1102,7 @@ tasks:
     cmds:
       - task: common:start
         env:
-          UPDATE_PROJECT: 'true'
-      - task: common:update:finish
-
+          UPDATE_PROJECT: "true"
   yubikey:
     desc: Create an OpenGPG-enabled YubiKey
     summary: |

diff --git a/package.json b/package.json
@@ -50,14 +50,14 @@
   },
   "optionalDependencies": {},
   "devDependencies": {
-    "@commitlint/config-conventional": "latest",
     "eslint-config-strict-mode": "latest",
     "git-cz-emoji": "latest",
-    "handlebars-helpers": "latest",
     "prettier": "^2.4.1",
     "prettier-config-sexy-mode": "latest",
     "semantic-release-config": "latest",
-    "typescript": "^4.5.5"
+    "typescript": "^4.5.5",
+    "@commitlint/config-conventional": "latest",
+    "handlebars-helpers": "latest"
   },
   "keywords": [
     "accelerated",
@@ -118,9 +118,7 @@
     "showAuthor": true
   },
   "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ],
+    "extends": [],
     "helpUrl": "https://megabyte.space/docs/contributing/commits"
   },
   "eslintConfig": {