Skip to content

Commit 96e9a4c

Browse files
authored
1 parent f256ef9 commit 96e9a4c

File tree

2 files changed

+7
-22
lines changed

2 files changed

+7
-22
lines changed

.github/workflows/ci-go.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,7 @@ jobs:
2828
strategy:
2929
matrix:
3030
go-version: [ '1.21', '1.20' ]
31-
terraform-version:
32-
- '0.12'
33-
- '0.13'
34-
- '0.14'
35-
- '0.15'
36-
- '1.0'
37-
- '1.1'
38-
- '1.2'
39-
- '1.3'
40-
- '1.4'
41-
- '1.5'
42-
- '1.6'
31+
terraform-version: ${{ fromJSON(vars.TF_VERSIONS_PROTOCOL_V5) }}
4332
steps:
4433
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4534
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0

.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)