Skip to content

Commit

Permalink
fix(ci): updating ci names
Browse files Browse the repository at this point in the history
  • Loading branch information
bassrock committed Aug 15, 2024
1 parent a07bd0b commit 7cb683b
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/actions/cdktf/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ runs:
cd ${{ inputs.stack-output-path }}
if [ "${{ inputs.behavior }}" = "apply" ]; then
echo "Apply behavior specified, applying terraform configuration in ${{ inputs.environment }}."
terraform apply
terraform apply --auto-approve
else
echo "Plan behavior specified, planning terraform configuration in ${{ inputs.environment }}."
tfcmt --var target:${{ inputs.scope }}-${{ inputs.environment }} plan --skip-no-changes --patch -- terraform plan -lock-timeout=10m
Expand Down
3 changes: 1 addition & 2 deletions .github/actions/containerize/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,4 @@ runs:
id: get-build-name
shell: bash
run: |
imageName=${{ fromJSON(steps.docker-build-push.outputs.metadata)['image.name'] }}
echo "::set-output name=docker-image-name::$imageName"
echo "docker-image-name='${{inputs.docker-repo-name}}:${{ github.sha }}'" >> $GITHUB_OUTPUT
2 changes: 1 addition & 1 deletion .github/actions/raw-terraform/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ runs:
cd ${{ inputs.stack-output-path }}
if [ "${{ inputs.behavior }}" = "apply" ]; then
echo "Apply behavior specified, applying terraform configuration in ${{ inputs.environment }}."
terraform apply
terraform apply --auto-approve
else
echo "Plan behavior specified, planning terraform configuration in ${{ inputs.environment }}."
tfcmt --var target:${{ inputs.scope }}-${{ inputs.environment }} plan --skip-no-changes --patch -- terraform plan -lock-timeout=10m
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/account-data-deleter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
secrets: inherit

# Let's try building and conidtionally pushing our docker image to the necessary account.
build-and-push-image:
api:
uses: ./.github/workflows/reuse-build-and-push-image.yml
needs: [infrastructure]
with:
Expand All @@ -49,10 +49,11 @@ jobs:
app-port: 4015
sentry-project: account-data-deleter
docker-repo-name-pattern: accountdatadeleter-{0}-app
terraform-output: ${{needs.infrastructure.outputs.terraform-output}}
# Ensure the re-usable workflow is allowed to access the secrets
secrets: inherit

build-and-push-lambda-events:
events-lambda:
uses: ./.github/workflows/reuse-build-and-push-lambda.yml
needs: [infrastructure]
with:
Expand All @@ -62,7 +63,7 @@ jobs:
# Ensure the re-usable workflow is allowed to access the secrets
secrets: inherit

build-and-push-lambda-batch-delete:
batch-delete-lambda:
uses: ./.github/workflows/reuse-build-and-push-lambda.yml
needs: [infrastructure]
with:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/list-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,15 @@ jobs:
# Ensure the re-usable workflow is allowed to access the secrets
secrets: inherit

build-and-push-image:
api:
uses: ./.github/workflows/reuse-build-and-push-image.yml
needs: [infrastructure]
with:
scope: list-api
app-path: servers/list-api
app-port: 4005
sentry-project: list-api
docker-repo-name-pattern: listapi-{0}-app
terraform-output: ${{needs.infrastructure.outputs.terraform-output}}
# Ensure the re-usable workflow is allowed to access the secrets
secrets: inherit
3 changes: 1 addition & 2 deletions .github/workflows/reuse-infrastructure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,5 @@ jobs:
run: |
echo "Grabbing Terraform Output"
cd ${{inputs['stack-output-path']}}
echo "terraform-output=$(terraform output -json)" >> $GITHUB_OUTPUT
echo '::set-output name=terraform-output::'
echo "terraform-output=$(terraform output -json | jq -c)" >> $GITHUB_OUTPUT
3 changes: 2 additions & 1 deletion .github/workflows/user-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
secrets: inherit

# Let's try building and conidtionally pushing our docker image to the necessary account.
build-and-push-image:
api:
uses: ./.github/workflows/reuse-build-and-push-image.yml
needs: [infrastructure]
with:
Expand All @@ -47,6 +47,7 @@ jobs:
app-port: 4006
sentry-project: user-api
docker-repo-name-pattern: userapi-{0}-app
terraform-output: ${{needs.infrastructure.outputs.terraform-output}}
# Ensure the re-usable workflow is allowed to access the secrets
secrets: inherit

Expand Down

0 comments on commit 7cb683b

Please sign in to comment.