Skip to content

Commit

Permalink
Merge pull request #293 from nimblehq/chore/gh-292-update-deps
Browse files Browse the repository at this point in the history
[#292] Update TF version and GH actions versions
  • Loading branch information
Nihisil authored Jul 31, 2024
2 parents 60bcad7 + ece63c6 commit b9a45f8
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/draft-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
echo "version=$currentVersion" >> $GITHUB_OUTPUT
- name: Draft a new release
uses: release-drafter/release-drafter@v5
uses: release-drafter/release-drafter@v6
env:
GITHUB_TOKEN: ${{ github.token }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/increment-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
run: npm install

- name: Create a new pull request
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
token: ${{ github.token }}
branch: chore/bump-version-to-${{ steps.next-version.outputs.version }}
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup node and restore cached dependencies
uses: actions/setup-node@v4
with:
node-version: '18.x'
cache: 'npm'
- name: Install dependencies in .tool-versions
uses: asdf-vm/actions/install@v3

- name: Install dependencies
run: npm ci

- name: Run linters
run: npm run lint

- name: Setup Terraform
uses: hashicorp/setup-terraform@v2
with:
terraform_version: 1.5.5

- name: Terraform fmt
run: terraform fmt -check -recursive
2 changes: 1 addition & 1 deletion .github/workflows/publish-wiki.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4
Expand Down
14 changes: 2 additions & 12 deletions .github/workflows/test-generated-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ on:
pull_request:
types: [opened, synchronize]

env:
TERRAFORM_VERSION: "1.5.5"
TFSEC_VERSION: "v1.28.1"

jobs:
test:
name: Run Tests Generated Project
Expand All @@ -17,11 +13,8 @@ jobs:
- name: Checkout the repository
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '18.x'
cache: 'npm'
- name: Install dependencies in .tool-versions
uses: asdf-vm/actions/install@v3

- name: Cache Node npm
id: cache-nodemodules
Expand All @@ -39,9 +32,6 @@ jobs:
- name: Generate project
run: . ./scripts/generateAdvancedAWS.sh

- name: Install dependencies from .tool-versions
uses: asdf-vm/actions/install@v2

- name: Run Terraform format
run: terraform fmt -recursive -check

Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4
Expand All @@ -37,7 +37,8 @@ jobs:
run: npm run test '--ignore-scripts' -- --coverage --ci

- name: Upload test coverage
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: jest-coverage
path: coverage/coverage-final.json
retention-days: 3
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodejs 18.12.1
terraform 1.5.5
terraform 1.8.3
trivy 0.47.0
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}

Expand Down
2 changes: 1 addition & 1 deletion templates/terraform/.tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
terraform 1.5.5
terraform 1.8.3
trivy 0.47.0
2 changes: 1 addition & 1 deletion templates/terraform/core/main.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
terraform {
# Terraform version
required_version = "1.5.5"
required_version = "1.8.3"
}
2 changes: 1 addition & 1 deletion templates/terraform/shared/main.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
terraform {
# Terraform version
required_version = "1.5.5"
required_version = "1.8.3"
}

0 comments on commit b9a45f8

Please sign in to comment.