Skip to content

Commit

Permalink
⤵️ automation(synchronize) Applying changes from upstream repository.
Browse files Browse the repository at this point in the history
  • Loading branch information
Megabyte Labs committed Mar 13, 2022
1 parent f191e6f commit 4011503
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 58 deletions.
32 changes: 30 additions & 2 deletions .config/Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,28 @@ brew "bat"
# @brew [bitwarden-cli](https://github.com/bitwarden/cli) - Access and manage a BitWarden instance via CLI
brew "bitwarden-cli"
# @brew [codeclimate](https://github.com/codeclimate/codeclimate) - Interact with CodeClimate via CLI
tap "codeclimate/formulae"
brew "codeclimate"
# tap "codeclimate/formulae"
# brew "codeclimate"
##### ERROR #####
# ==> Installing codeclimate from codeclimate/formulae
# ==> make install
# Last 15 lines from /home/megabyte/.cache/Homebrew/Logs/codeclimate/01.make:
# 2022-03-11 08:34:36 +0000
#
# make
# install
#
# bin/check
# Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running?
# Unable to run `docker version', the docker daemon may not be running
# Please ensure `docker version' succeeds and try again
# make: *** [Makefile:43: install] Error 1
#
# If reporting this issue please do so at (not Homebrew/brew or Homebrew/core):
# https://github.com/codeclimate/homebrew-formulae/issues
#
# Installing codeclimate has failed!
##### ERROR #####
# @brew [croc](https://github.com/schollz/croc) - A sharing tool that helps transfer files from one computer to another
brew "croc"
# @brew [curl](https://curl.se) - An HTTP command-line tool
Expand Down Expand Up @@ -56,8 +76,11 @@ brew "git-subrepo"
brew "glab"
# @brew [go](https://go.dev) - Open source programming language
brew "go"
# @brew [goofys](https://github.com/kahing/goofys) - High-performance, POSIX-ish Amazon S3 file system written in Go
brew "goofys"
# @brew [grex](https://github.com/pemistahl/grex) - Generate regular expressions by providing target matches
brew "grex"
# @brew [helm](https://helm.sh/) - The self-proclaimed package manager for Kubernetes
brew "helm"
# @brew [htmlq](https://github.com/mgdm/htmlq) - Use CSS to extract content from HTML via a CLI
brew "htmlq"
Expand All @@ -67,7 +90,9 @@ brew "hyperfine"
brew "jo"
# @brew [jq](https://stedolan.github.io/jq/) - Lightweight and flexible command-line JSON processor
brew "jq"
# @brew [kubectx](https://github.com/ahmetb/kubectx) - A tool for switching between Kubernetes clusters and namespaces
brew "kubectx"
# @brew [kubernetes-cli](https://kubernetes.io/docs/reference/kubectl/kubectl/) - The CLI for Kubernetes (also known as kubectl)
brew "kubernetes-cli"
# @brew [mc](https://github.com/minio/mc) - Replacement for ls, cp and other commands that are compatible with file-system-mounted S3 buckets
tap "minio/stable"
Expand Down Expand Up @@ -104,6 +129,7 @@ tap "go-task/tap"
brew "go-task/tap/go-task"
# @brew [teleport](https://github.com/bbatsche/homebrew-teleport) - An identity-aware SSH client for teams
brew "teleport"
# @brew [terraform](https://www.terraform.io/) - An infrastructure-as-code tool that allows you to define both cloud and on-prem resources
brew "terraform"
# @brew [tokei](https://github.com/XAMPPRocky/tokei) - Count and display the lines of code and the language used in a project
brew "tokei"
Expand Down Expand Up @@ -154,6 +180,8 @@ cask "java" unless system "/usr/libexec/java_home --failfast"
cask "lens"
# @cask [microsoft-teams](https://teams.microsoft.com/downloads) - Meet, chat, call, and collaborate in just one place
cask "microsoft-teams"
# @cask [osxfuse](https://github.com/osxfuse/osxfuse) - Extends macOS by adding support for user space file systems
cask "osxfuse"
# @cask [postman](https://www.postman.com/) - Collaboration platform for API development
cask "postman"
# @cask [slack](https://slack.com/) - Team communication and collaboration software
Expand Down
46 changes: 4 additions & 42 deletions Taskfile.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
version: '3'

includes:
ansible: ./.config/taskfiles/ansible/Taskfile.yml
ansible:ansibler: ./.config/taskfiles/ansible/Taskfile-ansibler.yml
Expand Down Expand Up @@ -79,9 +78,7 @@ includes:
web:ionic: ./.config/taskfiles/web/Taskfile-ionic.yml
web:nx: ./.config/taskfiles/web/Taskfile-nx.yml
web:profile: ./.config/taskfiles/web/Taskfile-profile.yml

output: interleaved

vars:
DOCKERHUB_PROFILE: megabytelabs
DOCKERHUB_USER: professormanhattan
Expand All @@ -97,11 +94,7 @@ vars:
GITHUB_ORG: ProfessorManhattan
GITHUB_USER: ProfessorManhattan
GROUP_EXEC_ASYNC: 'false'
IGNORE_FOLDERS: -path './.autodoc/*' -o -path './.cache/*' -o -path './.common*' -o -path './.config/*' -o -path './.git/*'
-o -path './.github/*' -o -path './.gitlab/*' -o -path './.husky/*' -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'
IGNORE_FOLDERS: -path './.autodoc/*' -o -path './.cache/*' -o -path './.common*' -o -path './.config/*' -o -path './.git/*' -o -path './.github/*' -o -path './.gitlab/*' -o -path './.husky/*' -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'
INIT_SCRIPT: https://gitlab.com/megabyte-labs/gitlab-ci/-/raw/master/scripts/update-init.sh
LOG_FIX:
sh: chmod +x .config/log && echo "heyhey"
Expand All @@ -118,7 +111,6 @@ vars:
REPOSITORY_TYPE: ansible
SEMANTIC_CONFIG: semantic-release-config
TIMEZONE: America/New_York

env:
OSTYPE:
sh: |
Expand All @@ -129,7 +121,6 @@ env:
RECORD_INSTALL:
sh: test -n "$CI" && echo "true" || true
SENTRY_DSN: ''

profile: |
PATH="$PATH:$HOME/.local/bin:$HOME/.poetry/bin"
if [[ "$OSTYPE" == 'linux-gnu'* ]] || [[ "$OSTYPE" == 'linux-musl'* ]]; then
Expand All @@ -149,7 +140,6 @@ profile: |
if [ -f .venv/bin/activate ]; then
. .venv/bin/activate
fi
tasks:
build:
deps:
Expand All @@ -174,7 +164,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 @@ -185,13 +174,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 @@ -208,7 +195,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 @@ -244,15 +230,12 @@ tasks:
git add --all
git commit
{{end}}
commit:quick:
cmds:
- 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

donothing: 'true'

fix:
desc: Run code auto-fixers / auto-formatters
summary: |
Expand All @@ -263,7 +246,6 @@ tasks:
an error so the auto-fixes still have to be validated.
cmds:
- task: fix:all

get:links:
deps:
- install:software:jq
Expand All @@ -276,7 +258,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 @@ -297,7 +278,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 @@ -341,7 +321,6 @@ tasks:
fi
- task: ci:commit
- task: ci:synchronize

lint:
desc: Lints the project using all linters
summary: |
Expand All @@ -355,7 +334,6 @@ tasks:
`task lint`
cmds:
- task: lint:all

livereload:
deps:
- install:npm:nodemon
Expand Down Expand Up @@ -395,12 +373,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 @@ -441,7 +417,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 @@ -458,7 +433,6 @@ tasks:
cmds:
- task: boilerplate:check:package
- task: boilerplate:clean

publish:
desc: Publish a semantic release via `semantic-release`
summary: |
Expand Down Expand Up @@ -506,7 +480,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 @@ -532,10 +505,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 '🔨 build(version bump): semantic-release {{.UPDATE_LEVEL}}' -n
- "HUSKY=0 git commit -a --allow-empty -m '\U0001F528 build(version bump): semantic-release {{.UPDATE_LEVEL}}' -n\n"
- task: publish

pull:upstream:
desc: Pull from upstream repositories
summary: |
Expand All @@ -552,7 +523,6 @@ tasks:
success: Successfully pulled from `upstreamRemotes`
cmds:
- task: common:update:upstream:remotes:pull

repair:
cmds:
- |
Expand All @@ -565,7 +535,6 @@ tasks:
else
bash <(curl -sSL {{.INIT_SCRIPT}})
fi
reset:
desc: Resets the project by removing all caches and then re-generating templated files
summary: |
Expand All @@ -577,7 +546,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 @@ -596,7 +564,6 @@ tasks:
answer:
cmds:
- task: common:reset:force

scripts:
interactive: true
deps:
Expand All @@ -614,7 +581,6 @@ tasks:
start: Running `NTL_RUNNER={{.NPM_PROGRAM}} {{.NPX_HANDLE}}ntl`
cmds:
- NTL_RUNNER={{.NPM_PROGRAM}} {{.NPX_HANDLE}}ntl

services:
desc: Update elements of the repository that require API access
summary: |
Expand All @@ -627,7 +593,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 @@ -661,7 +626,6 @@ tasks:
* ubuntu-21.04
cmds:
- task: common:shell

start:
desc: Set up the project and refresh it with the latest changes
summary: |
Expand All @@ -682,7 +646,6 @@ tasks:
success: Successfully synchronized the project with upstream file changes and also bootstrapped the project
cmds:
- task: upstream:project

test:
deps:
- install:software:jq
Expand Down Expand Up @@ -713,7 +676,6 @@ tasks:
else
[[ $- == *i* ]] && task prepare || (.config/log error '{{.NONINTERACTIVE_MISSING_TEST_CMD}}' && exit 1)
fi
update:
desc: Update the repository
log:
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
11 changes: 4 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"lint": "bash start.sh && task list",
"preload": "bash start.sh && task preload",
"prepare": "bash start.sh && (test -f Taskfile.yml && task npm:prepare) || true",
"publish": "task publish:semantic-release",
"prepublishOnly": "test -z SKIP_NPM_PREPUBLISHONLY && bash start.sh && task npm:bundle:create || true",
"release": "bash start.sh && task publish:semantic-release",
"repair": "bash <(curl -sS https://install.doctor/repair)",
Expand All @@ -41,13 +40,13 @@
"dependencies": {},
"optionalDependencies": {},
"devDependencies": {
"@commitlint/config-conventional": "latest",
"eslint-config-strict-mode": "latest",
"git-cz-emoji": "latest",
"handlebars-helpers": "latest",
"prettier-config-sexy-mode": "latest",
"semantic-release-config": "latest",
"typescript": "latest"
"typescript": "latest",
"@commitlint/config-conventional": "latest",
"handlebars-helpers": "latest"
},
"keywords": [
"ansible",
Expand Down Expand Up @@ -110,9 +109,7 @@
"showAuthor": true
},
"commitlint": {
"extends": [
"@commitlint/config-conventional"
],
"extends": [],
"helpUrl": "https://megabyte.space/docs/contributing/commits"
},
"eslintConfig": {
Expand Down
Loading

0 comments on commit 4011503

Please sign in to comment.