diff --git a/.github/workflows/draft-new-release.yml b/.github/workflows/draft-new-release.yml index 6a591d46..3574981b 100644 --- a/.github/workflows/draft-new-release.yml +++ b/.github/workflows/draft-new-release.yml @@ -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: diff --git a/.github/workflows/increment-version.yml b/.github/workflows/increment-version.yml index 66b849fd..e55cdfba 100644 --- a/.github/workflows/increment-version.yml +++ b/.github/workflows/increment-version.yml @@ -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 }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 555a0663..3a2c72cd 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,13 +12,10 @@ 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 @@ -26,10 +23,5 @@ jobs: - 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 diff --git a/.github/workflows/publish-wiki.yml b/.github/workflows/publish-wiki.yml index bb2a59c2..74c8f19d 100644 --- a/.github/workflows/publish-wiki.yml +++ b/.github/workflows/publish-wiki.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout the repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.head_ref }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0d150e65..bc133ce7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Node uses: actions/setup-node@v4 diff --git a/.github/workflows/test-generated-project.yml b/.github/workflows/test-generated-project.yml index 5ef83017..5db12fb8 100644 --- a/.github/workflows/test-generated-project.yml +++ b/.github/workflows/test-generated-project.yml @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e0b9a3b7..05ef9475 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 @@ -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 diff --git a/.tool-versions b/.tool-versions index c27d5db4..141ff6a8 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ nodejs 18.12.1 -terraform 1.5.5 +terraform 1.8.3 trivy 0.47.0 diff --git a/templates/addons/versionControl/github/.github/workflows/lint.yml b/templates/addons/versionControl/github/.github/workflows/lint.yml index 80b67ebe..bb7fa484 100644 --- a/templates/addons/versionControl/github/.github/workflows/lint.yml +++ b/templates/addons/versionControl/github/.github/workflows/lint.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout the repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.head_ref }} diff --git a/templates/terraform/.tool-versions b/templates/terraform/.tool-versions index 97859cc4..6d4dba59 100644 --- a/templates/terraform/.tool-versions +++ b/templates/terraform/.tool-versions @@ -1,2 +1,2 @@ -terraform 1.5.5 +terraform 1.8.3 trivy 0.47.0 diff --git a/templates/terraform/core/main.tf b/templates/terraform/core/main.tf index 46e67365..34223c4f 100644 --- a/templates/terraform/core/main.tf +++ b/templates/terraform/core/main.tf @@ -1,4 +1,4 @@ terraform { # Terraform version - required_version = "1.5.5" + required_version = "1.8.3" } diff --git a/templates/terraform/shared/main.tf b/templates/terraform/shared/main.tf index 46e67365..34223c4f 100644 --- a/templates/terraform/shared/main.tf +++ b/templates/terraform/shared/main.tf @@ -1,4 +1,4 @@ terraform { # Terraform version - required_version = "1.5.5" + required_version = "1.8.3" }