From d61932a4693e1b57729fd351c72ec17aa3df3f1e Mon Sep 17 00:00:00 2001 From: Valter Silva Date: Sat, 2 Mar 2024 09:40:29 +0000 Subject: [PATCH] fix: lack of versions --- .github/workflows/test.yaml | 15 ++++++++------- lib/make/aws/cli.mk | 2 +- lib/make/nodejs.mk | 5 +++++ lib/make/npm.mk | 18 ++++++++++++++---- lib/make/nuke.mk | 3 ++- lib/make/prettier.mk | 2 +- lib/make/ubuntu.mk | 4 ++++ tools.env | 1 + 8 files changed, 36 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e59aa84..2662452 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -2,11 +2,9 @@ name: Test on: push: branches: - - feature/* - - bugfix/* - - hotfix/* - - develop - main + schedule: + - cron: '0 0 * * *' jobs: habits: @@ -46,8 +44,8 @@ jobs: - name: Cobra Install run: make go/install cobra/install - - name: Cobra version - run: make cobra/version + # - name: Cobra version + # run: make cobra/version # TODO go: runs-on: [ubuntu-latest] steps: @@ -113,7 +111,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Prettier Install + - name: Setup NPM Global + run: make npm/install-global npm/update-path + + - name: Install Prettier run: make prettier/install - name: Prettier version diff --git a/lib/make/aws/cli.mk b/lib/make/aws/cli.mk index bd320e4..81e2348 100644 --- a/lib/make/aws/cli.mk +++ b/lib/make/aws/cli.mk @@ -23,7 +23,7 @@ aws/cli/autocomplete: .PHONY: aws/cli/install/sso-creds-helper aws/cli/install/sso-creds-helper: - @source /usr/local/share/nvm/nvm.sh && npm install -g aws-sso-creds-helper + npm install -g aws-sso-creds-helper .PHONY: aws/cli/version ## Display AWS CLI version diff --git a/lib/make/nodejs.mk b/lib/make/nodejs.mk index 682efc0..467d2e5 100644 --- a/lib/make/nodejs.mk +++ b/lib/make/nodejs.mk @@ -25,3 +25,8 @@ nodejs/install/v20: .PHONY: nodejs/install ## Install NodeJS nodejs/install: nodejs/install/v18 + +.PHONY: nodejs/version +## Show NodeJS version +nodejs/version: + @node --version \ No newline at end of file diff --git a/lib/make/npm.mk b/lib/make/npm.mk index 58b5263..3b3698e 100644 --- a/lib/make/npm.mk +++ b/lib/make/npm.mk @@ -4,7 +4,17 @@ npm/install: @sudo apt-get update @sudo apt-get install --yes npm -.PHONY: npm/aws-sso-creds-helper/install -## Install NPM package sso-creds (DevContainer) -npm/aws-sso-creds-helper/install: - @source /usr/local/share/nvm/nvm.sh && npm install -g aws-sso-creds-helper +.PHONY: npm/version +## Show NPM version +npm/version: + @npm --version + +.PHONY: npm/install-global +npm/install-global: + mkdir -p ~/.npm-global + npm config set prefix '~/.npm-global' + +.PHONY: npm/update-path +npm/update-path: + echo 'export PATH=~/.npm-global/bin:$$PATH' >> ~/.bashrc + source ~/.bashrc diff --git a/lib/make/nuke.mk b/lib/make/nuke.mk index 347e2ec..eadb8fa 100644 --- a/lib/make/nuke.mk +++ b/lib/make/nuke.mk @@ -1,5 +1,6 @@ .PHONY: nuke/install -nuke/install: is/env/set/AWS_NUKE_VERSION +nuke/install: + $(call assert-set,AWS_NUKE_VERSION) wget https://github.com/rebuy-de/aws-nuke/releases/download/$(AWS_NUKE_VERSION)/aws-nuke-$(AWS_NUKE_VERSION)-linux-amd64.tar.gz tar -xzf aws-nuke-$(AWS_NUKE_VERSION)-linux-amd64.tar.gz sudo mv aws-nuke-$(AWS_NUKE_VERSION)-linux-amd64 /usr/local/bin/aws-nuke diff --git a/lib/make/prettier.mk b/lib/make/prettier.mk index 740f3f5..410d286 100644 --- a/lib/make/prettier.mk +++ b/lib/make/prettier.mk @@ -1,3 +1,3 @@ .PHONY: prettier/install prettier/install: - @source /usr/local/share/nvm/nvm.sh && npm install -g prettier + npm install -g prettier diff --git a/lib/make/ubuntu.mk b/lib/make/ubuntu.mk index 7e1eb6e..5a6ff25 100644 --- a/lib/make/ubuntu.mk +++ b/lib/make/ubuntu.mk @@ -5,3 +5,7 @@ ubuntu/install: ansible/playbooks/ubuntu/install .PHONY: ubuntu/update ## Update and upgrade Ubuntu packages ubuntu/update: ansible/playbooks/ubuntu/update + +.PHONY: ubuntu/version +ubuntu/version: + @lsb_release -a \ No newline at end of file diff --git a/tools.env b/tools.env index fd0b7eb..b5a5f8b 100644 --- a/tools.env +++ b/tools.env @@ -1,2 +1,3 @@ +AWS_NUKE_VERSION=v2.25.0 GOMPLATE_VERSION=3.11.3 TERRAFORM_DOCS_VERSION=0.16.0