Skip to content

Commit 0a01cae

Browse files
committed
ci: fix terraform github vars collide with semantic release ones
1 parent 423f750 commit 0a01cae

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

.envrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dotenv_if_exists
22

3-
export GITHUB_APP_PEM_FILE=$(cat "$GITHUB_APP_PEM_FILE_PATH")
3+
export GITHUB_APP_PEM_FILE="$(cat "$GITHUB_APP_PEM_FILE_PATH")"
44

55
TF_WORKSPACE="$GITHUB_OWNER"

.github/workflows/terraform.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ env:
1212
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
1313
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
1414
# GitHub App configuration
15-
GITHUB_OWNER: ${{ vars.GH_OWNER }}
16-
GITHUB_APP_ID: ${{ vars.GH_APP_ID }}
17-
GITHUB_APP_INSTALLATION_ID: ${{ vars.GH_APP_INSTALLATION_ID }}
18-
GITHUB_APP_PEM_FILE: ${{ secrets.GH_APP_PEM_FILE }}
15+
GITHUB_OWNER: ${{ vars.GH_TF_OWNER }}
16+
GITHUB_APP_ID: ${{ vars.GH_TF_APP_ID }}
17+
GITHUB_APP_INSTALLATION_ID: ${{ vars.GH_TF_APP_INSTALLATION_ID }}
18+
GITHUB_APP_PEM_FILE: |
19+
${{ secrets.GH_TF_APP_PEM_FILE }}
1920
# Terraform configuration
20-
TF_WORKSPACE: ${{ vars.GH_OWNER }}
21+
TF_WORKSPACE: ${{ vars.GH_TF_OWNER }}
2122
TF_VAR_config: "../test.yaml"
2223
TF_IN_AUTOMATION: true
2324

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ Set up GitHub actions, variables and secrets:
6262
- Secrets and variables / Actions / Actions secrets and variables
6363
- Secrets
6464
- **New repository secret**
65-
- `GH_APP_PEM_FILE` (`GITHUB_APP_PEM_FILE_PATH` contents)
65+
- `GH_TF_APP_PEM_FILE` (`GITHUB_APP_PEM_FILE_PATH` contents)
6666
- `AWS_ACCESS_KEY_ID`
6767
- `AWS_SECRET_ACCESS_KEY`
6868
- Variables
6969
- **New repository variable**
70-
- `GH_OWNER` (`GITHUB_OWNER`)
71-
- `GH_APP_ID` (`GITHUB_APP_ID`)
72-
- `GH_APP_INSTALLATION_ID` (`GITHUB_APP_INSTALLATION_ID`)
70+
- `GH_TF_OWNER` (`GITHUB_OWNER`)
71+
- `GH_TF_APP_ID` (`GITHUB_APP_ID`)
72+
- `GH_TF_APP_INSTALLATION_ID` (`GITHUB_APP_INSTALLATION_ID`)
7373
- `AWS_ENDPOINT_URL_S3`
7474

7575
## Usage

0 commit comments

Comments
 (0)