Skip to content

Commit ea24a76

Browse files
authored
1 parent 72bba20 commit ea24a76

File tree

2 files changed

+8
-22
lines changed

2 files changed

+8
-22
lines changed

.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
@@ -50,11 +46,11 @@ jobs:
5046

5147
- name: Git push changelog
5248
run: |
53-
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
54-
git config --global user.email "${{ env.CI_COMMIT_EMAIL }}"
49+
git config --global user.name "${{ vars.TF_DEVEX_CI_COMMIT_AUTHOR }}"
50+
git config --global user.email "${{ vars.TF_DEVEX_CI_COMMIT_EMAIL }}"
5551
git add .
5652
git commit -a -m "Update changelog"
57-
git push "https://${{ env.CI_COMMIT_AUTHOR }}:${{ secrets.TF_DEVEX_COMMIT_GITHUB_TOKEN }}@github.com/${{ github.repository }}.git"
53+
git push "https://${{ vars.TF_DEVEX_CI_COMMIT_AUTHOR }}:${{ secrets.TF_DEVEX_COMMIT_GITHUB_TOKEN }}@github.com/${{ github.repository }}.git"
5854
5955
release-tag:
6056
needs: changelog
@@ -73,11 +69,11 @@ jobs:
7369

7470
- name: Git push release tag
7571
run: |
76-
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
77-
git config --global user.email "${{ env.CI_COMMIT_EMAIL }}"
72+
git config --global user.name "${{ vars.TF_DEVEX_CI_COMMIT_AUTHOR }}"
73+
git config --global user.email "${{ vars.TF_DEVEX_CI_COMMIT_EMAIL }}"
7874
7975
git tag "${{ inputs.versionNumber }}"
80-
git push "https://${{ env.CI_COMMIT_AUTHOR }}:${{ secrets.TF_DEVEX_COMMIT_GITHUB_TOKEN }}@github.com/${{ github.repository }}.git" "${{ inputs.versionNumber }}"
76+
git push "https://${{ vars.TF_DEVEX_CI_COMMIT_AUTHOR }}:${{ secrets.TF_DEVEX_COMMIT_GITHUB_TOKEN }}@github.com/${{ github.repository }}.git" "${{ inputs.versionNumber }}"
8177
8278
release-notes:
8379
needs: [ changelog-version, changelog, release-tag ]

.github/workflows/test.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,7 @@ jobs:
5858
- macos-latest
5959
- windows-latest
6060
- ubuntu-latest
61-
terraform:
62-
- '0.12.*'
63-
- '0.13.*'
64-
- '0.14.*'
65-
- '0.15.*'
66-
- '1.0.*'
67-
- '1.1.*'
68-
- '1.2.*'
69-
- '1.3.*'
70-
- '1.4.*'
71-
- '1.5.*'
61+
terraform: ${{ fromJSON(vars.TF_VERSIONS_PROTOCOL_V5) }}
7262
steps:
7363

7464
- name: Check out code
@@ -83,7 +73,7 @@ jobs:
8373
- name: Setup Terraform ${{ matrix.terraform }}
8474
uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.3
8575
with:
86-
terraform_version: ${{ matrix.terraform }}
76+
terraform_version: ${{ matrix.terraform }}.*
8777
terraform_wrapper: false
8878

8979
- name: Run acceptance test

0 commit comments

Comments
 (0)