Skip to content

Commit

Permalink
☁️ chore(automation): Applying changes from upstream repository.
Browse files Browse the repository at this point in the history
  • Loading branch information
Megabyte Labs committed Sep 27, 2022
1 parent d9a5fab commit 383b585
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 87 deletions.
6 changes: 3 additions & 3 deletions .config/taskfiles/ci/Taskfile-github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ tasks:
synchronize:
deps:
- :install:software:git
summary: |
Forces a push to the GitHub master branch so that GitHub stays mirrored with
the GitLab master branch.
env:
GITHUB_HTTP_REPO:
sh: jq -r '.blueprint.repository.github' package.json
summary: |
Forces a push to the GitHub master branch so that GitHub stays mirrored with
the GitLab master branch.
cmds:
- cmd: |
if [ "$GITHUB_HTTP_REPO" != 'null' ]; then
Expand Down
2 changes: 1 addition & 1 deletion .config/taskfiles/docker/Taskfile-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ tasks:
- grep 'org.opencontainers.image.documentation' Dockerfile

# yamllint disable rule:line-length

# eslint-disable max-len
labels:update:
vars:
AUTHORS:
Expand Down
1 change: 1 addition & 0 deletions .config/taskfiles/release/Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ tasks:
status:
- '[ "$SNAP_PACKAGE" == "null" ]'

# eslint-disable max-len
analyze:
summary: |
| Command property | Description |
Expand Down
85 changes: 9 additions & 76 deletions Taskfile.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
version: '3'

includes:
ansible:
taskfile: ./.config/taskfiles/ansible/Taskfile.yml
Expand Down Expand Up @@ -311,9 +310,7 @@ includes:
web:profile:
taskfile: ./.config/taskfiles/web/Taskfile-profile.yml
optional: true

output: interleaved

vars:
DOCKERHUB_PROFILE:
sh: |
Expand Down Expand Up @@ -366,11 +363,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
Expand Down Expand Up @@ -402,34 +395,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: |
Expand Down Expand Up @@ -462,7 +434,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
Expand All @@ -481,7 +452,6 @@ profile: |
if [ -f .venv/bin/activate ]; then
. .venv/bin/activate
fi
tasks:
build:
deps:
Expand Down Expand Up @@ -510,7 +480,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: |
Expand All @@ -521,13 +490,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: |
Expand All @@ -544,7 +511,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
Expand Down Expand Up @@ -582,24 +548,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: |
Expand All @@ -610,7 +572,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:
Expand All @@ -622,7 +583,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
Expand All @@ -635,7 +595,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: |
Expand All @@ -656,7 +615,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
Expand Down Expand Up @@ -689,12 +647,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: |
Expand All @@ -708,7 +664,6 @@ tasks:
`task lint`
cmds:
- task: lint:all

livereload:
deps:
- install:npm:nodemon
Expand Down Expand Up @@ -748,12 +703,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: |
Expand Down Expand Up @@ -796,7 +749,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: |
Expand All @@ -813,7 +765,6 @@ tasks:
cmds:
- task: boilerplate:check:package
- task: boilerplate:clean

publish:
desc: Publish a semantic release via `semantic-release`
summary: |
Expand Down Expand Up @@ -861,7 +812,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: |
Expand All @@ -887,10 +837,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: |
Expand All @@ -907,7 +855,6 @@ tasks:
success: Successfully pulled from `upstreamRemotes`
cmds:
- task: common:update:upstream:remotes:pull

repair:
cmds:
- task: common:repair
Expand All @@ -918,7 +865,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: |
Expand All @@ -930,7 +876,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: |
Expand All @@ -949,7 +894,6 @@ tasks:
answer:
cmds:
- task: common:reset:force

scripts:
interactive: true
deps:
Expand All @@ -967,7 +911,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: |
Expand All @@ -980,7 +923,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: |
Expand Down Expand Up @@ -1014,13 +956,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: |
Expand All @@ -1044,7 +984,6 @@ tasks:
success: Project started!
cmds:
- task: common:start

synchronize:
desc: Set up the project and refresh it with the latest changes
summary: |
Expand All @@ -1065,7 +1004,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: |
Expand Down Expand Up @@ -1094,7 +1032,6 @@ tasks:
```
cmds:
- task: common:util:task:tag:deps

template:
deps:
- install:npm:liquidjs
Expand All @@ -1116,7 +1053,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
Expand Down Expand Up @@ -1147,7 +1083,6 @@ tasks:
else
[[ $- == *i* ]] && task prepare || (.config/log error '{{.NONINTERACTIVE_MISSING_TEST_CMD}}' && exit 1)
fi
update:
desc: Fully update the repository
summary: |
Expand All @@ -1174,9 +1109,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: |
Expand Down
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ galaxy_info:
company: Megabyte Labs
issue_tracker_url: https://gitlab.com/megabyte-labs/ansible-roles/rust/-/issues
license: license (MIT)
min_ansible_version: 2.1
min_ansible_version: 2.10
platforms:
- name: Mac
versions:
Expand Down
Loading

0 comments on commit 383b585

Please sign in to comment.