Skip to content

Commit 106b050

Browse files
authored
1 parent e399a1c commit 106b050

File tree

2 files changed

+10
-32
lines changed

2 files changed

+10
-32
lines changed

.github/workflows/ci-go.yml

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
go-version-file: 'go.mod'
4040
- uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
4141
with:
42-
terraform_version: ${{ matrix.terraform }}
42+
terraform_version: ${{ matrix.terraform }}.*
4343
terraform_wrapper: false
4444
- run: go mod edit -replace github.com/hashicorp/terraform-plugin-go=../
4545
- run: go mod tidy
@@ -54,18 +54,7 @@ jobs:
5454
fail-fast: false
5555
matrix:
5656
os: [macos-latest, windows-latest, ubuntu-latest]
57-
terraform:
58-
- '0.12.*'
59-
- '0.13.*'
60-
- '0.14.*'
61-
- '0.15.*'
62-
- '1.0.*'
63-
- '1.1.*'
64-
- '1.2.*'
65-
- '1.3.*'
66-
- '1.4.*'
67-
- '1.5.*'
68-
- '1.6.*'
57+
terraform: ${{ fromJSON(vars.TF_VERSIONS_PROTOCOL_V5) }}
6958
terraform-provider-corner-tfprotov6:
7059
defaults:
7160
run:
@@ -83,7 +72,7 @@ jobs:
8372
go-version-file: 'go.mod'
8473
- uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
8574
with:
86-
terraform_version: ${{ matrix.terraform }}
75+
terraform_version: ${{ matrix.terraform }}.*
8776
terraform_wrapper: false
8877
- run: go mod edit -replace github.com/hashicorp/terraform-plugin-go=../
8978
- run: go mod tidy
@@ -97,14 +86,7 @@ jobs:
9786
fail-fast: false
9887
matrix:
9988
os: [macos-latest, windows-latest, ubuntu-latest]
100-
terraform:
101-
- '1.0.*'
102-
- '1.1.*'
103-
- '1.2.*'
104-
- '1.3.*'
105-
- '1.4.*'
106-
- '1.5.*'
107-
- '1.6.*'
89+
terraform: ${{ fromJSON(vars.TF_VERSIONS_PROTOCOL_V6) }}
10890
test:
10991
name: test (Go v${{ matrix.go-version }})
11092
runs-on: ubuntu-latest

.github/workflows/release.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ on:
1111
permissions:
1212
contents: read # Changelog commit operations use service account PAT
1313

14-
env:
15-
CI_COMMIT_AUTHOR: hc-github-team-tf-provider-devex
16-
CI_COMMIT_EMAIL: [email protected]
17-
1814
jobs:
1915
changelog-version:
2016
runs-on: ubuntu-latest
@@ -47,11 +43,11 @@ jobs:
4743
args: merge
4844
- name: Git push changelog
4945
run: |
50-
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
51-
git config --global user.email "${{ env.CI_COMMIT_EMAIL }}"
46+
git config --global user.name "${{ vars.TF_DEVEX_CI_COMMIT_AUTHOR }}"
47+
git config --global user.email "${{ vars.TF_DEVEX_CI_COMMIT_EMAIL }}"
5248
git add .
5349
git commit -a -m "Update changelog"
54-
git push "https://${{ env.CI_COMMIT_AUTHOR }}:${{ secrets.TF_DEVEX_COMMIT_GITHUB_TOKEN }}@github.com/${{ github.repository }}.git"
50+
git push "https://${{ vars.TF_DEVEX_CI_COMMIT_AUTHOR }}:${{ secrets.TF_DEVEX_COMMIT_GITHUB_TOKEN }}@github.com/${{ github.repository }}.git"
5551
5652
release-tag:
5753
needs: changelog
@@ -70,11 +66,11 @@ jobs:
7066

7167
- name: Git push release tag
7268
run: |
73-
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
74-
git config --global user.email "${{ env.CI_COMMIT_EMAIL }}"
69+
git config --global user.name "${{ vars.TF_DEVEX_CI_COMMIT_AUTHOR }}"
70+
git config --global user.email "${{ vars.TF_DEVEX_CI_COMMIT_EMAIL }}"
7571
7672
git tag "${{ inputs.versionNumber }}"
77-
git push "https://${{ env.CI_COMMIT_AUTHOR }}:${{ secrets.TF_DEVEX_COMMIT_GITHUB_TOKEN }}@github.com/${{ github.repository }}.git" "${{ inputs.versionNumber }}"
73+
git push "https://${{ vars.TF_DEVEX_CI_COMMIT_AUTHOR }}:${{ secrets.TF_DEVEX_COMMIT_GITHUB_TOKEN }}@github.com/${{ github.repository }}.git" "${{ inputs.versionNumber }}"
7874
7975
goreleaser:
8076
needs: [ changelog-version, changelog, release-tag ]

0 commit comments

Comments
 (0)