From 692fcccb695b63eab1af72e15a3d8017484e9cf9 Mon Sep 17 00:00:00 2001 From: Dan Callao Date: Wed, 10 Jan 2024 18:58:29 -0800 Subject: [PATCH] ci: fixed release and pre-commit ci jobs --- .github/workflows/pre-commit.yaml | 2 +- .github/workflows/release.yaml | 2 + .releaserc.json | 82 +++++++++++++-------------- examples/cluster-with-cni/versions.tf | 4 +- examples/cpem-add-on/versions.tf | 2 +- versions.tf | 2 +- 6 files changed, 48 insertions(+), 46 deletions(-) diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml index 2e914ab..4e50022 100644 --- a/.github/workflows/pre-commit.yaml +++ b/.github/workflows/pre-commit.yaml @@ -67,6 +67,6 @@ jobs: with: repo: aquasecurity/tfsec platform: linux - arch: x86-64 + arch: amd64 - uses: pre-commit/action@v3.0.0 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 569513c..01ca2f7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -21,6 +21,8 @@ jobs: with: semantic_version: 19.0.5 extra_plugins: | + @semantic-release/changelog@6.0.0 + @semantic-release/git@10.0.0 conventional-changelog-conventionalcommits@4.6.3 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.releaserc.json b/.releaserc.json index 4e8212e..7bd71a9 100644 --- a/.releaserc.json +++ b/.releaserc.json @@ -1,44 +1,44 @@ { - "branches": [ - "main" + "branches": [ + "main" + ], + "ci": false, + "plugins": [ + [ + "@semantic-release/commit-analyzer", + { + "preset": "conventionalcommits" + } ], - "ci": false, - "plugins": [ - [ - "@semantic-release/commit-analyzer", - { - "preset": "conventionalcommits" - } - ], - [ - "@semantic-release/release-notes-generator", - { - "preset": "conventionalcommits" - } - ], - [ - "@semantic-release/github", - { - "successComment": "This ${issue.pull_request ? 'PR is included' : 'issue has been resolved'} in version ${nextRelease.version} :tada:", - "labels": false, - "releasedLabels": false - } - ], - [ - "@semantic-release/changelog", - { - "changelogFile": "CHANGELOG.md", - "changelogTitle": "# Changelog\n\nAll notable changes to this project will be documented in this file." - } - ], - [ - "@semantic-release/git", - { - "assets": [ - "CHANGELOG.md" - ], - "message": "chore(release): version ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" - } - ] + [ + "@semantic-release/release-notes-generator", + { + "preset": "conventionalcommits" + } + ], + [ + "@semantic-release/github", + { + "successComment": "This ${issue.pull_request ? 'PR is included' : 'issue has been resolved'} in version ${nextRelease.version} :tada:", + "labels": false, + "releasedLabels": false + } + ], + [ + "@semantic-release/changelog", + { + "changelogFile": "CHANGELOG.md", + "changelogTitle": "# Changelog\n\nAll notable changes to this project will be documented in this file." + } + ], + [ + "@semantic-release/git", + { + "assets": [ + "CHANGELOG.md" + ], + "message": "chore(release): version ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" + } ] - } + ] +} diff --git a/examples/cluster-with-cni/versions.tf b/examples/cluster-with-cni/versions.tf index e3b8bb4..653ab14 100644 --- a/examples/cluster-with-cni/versions.tf +++ b/examples/cluster-with-cni/versions.tf @@ -2,12 +2,12 @@ terraform { required_providers { equinix = { source = "equinix/equinix" - version = "~> 1.14.0" + version = "~> 1.20.0" } null = { source = "hashicorp/null" - version = "~> 3.2.1" + version = "~> 3.2.2" } } required_version = ">= 1.0.0" diff --git a/examples/cpem-add-on/versions.tf b/examples/cpem-add-on/versions.tf index 2280135..50fa7a9 100644 --- a/examples/cpem-add-on/versions.tf +++ b/examples/cpem-add-on/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { equinix = { source = "equinix/equinix" - version = "~> 1.14.0" + version = "~> 1.20.0" } } required_version = ">= 1.0.0" diff --git a/versions.tf b/versions.tf index 7e474e4..a552ab6 100644 --- a/versions.tf +++ b/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { equinix = { source = "equinix/equinix" - version = "~> 1.14.0" + version = "~> 1.20.0" } tls = { source = "hashicorp/tls"