Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,19 @@ jobs:
image_artifact: ${{ needs.docker-build.outputs.image_artifact }}

helm-lint:
uses: entur/gha-helm/.github/workflows/lint.yml@v1.6.1
uses: entur/gha-helm/.github/workflows/lint.yml@v1.7.0
with:
environment: dev

terraform-lint:
uses: entur/gha-terraform/.github/workflows/lint.yml@v2.3.1
uses: entur/gha-terraform/.github/workflows/lint.yml@v2.5.0


tf-plan-dev:
if: ${{ !cancelled() && !contains(needs.*.result, 'failure') }}
needs: [ terraform-lint, docker-push ]
name: Terraform Plan DEV
uses: entur/gha-terraform/.github/workflows/plan.yml@v2.3.1
uses: entur/gha-terraform/.github/workflows/plan.yml@v2.5.0
with:
environment: dev

Expand All @@ -84,15 +84,15 @@ jobs:
if: ${{ !cancelled() && !contains(needs.*.result, 'failure') && needs.tf-plan-dev.outputs.has_changes == 'true' }}
needs: [ tf-plan-dev, tf-approval-dev ]
name: Terraform Apply DEV
uses: entur/gha-terraform/.github/workflows/apply.yml@v2.3.1
uses: entur/gha-terraform/.github/workflows/apply.yml@v2.5.0
with:
environment: dev
has_changes: ${{ needs.tf-plan-dev.outputs.has_changes }}

deploy-dev:
if: ${{ !cancelled() && !contains(needs.*.result, 'failure') && github.ref == 'refs/heads/master' }}
needs: [ helm-lint, tf-plan-dev, tf-apply-dev, docker-push ]
uses: entur/gha-helm/.github/workflows/deploy.yml@v1.6.1
uses: entur/gha-helm/.github/workflows/deploy.yml@v1.7.0
with:
environment: dev
image: ${{ needs.docker-push.outputs.image_name }}:${{ needs.docker-push.outputs.image_tag}}
Expand All @@ -117,7 +117,7 @@ jobs:
if: ${{ !cancelled() && !contains(needs.*.result, 'failure') }}
needs: [ terraform-lint, approval-tst ]
name: Terraform Plan TST
uses: entur/gha-terraform/.github/workflows/plan.yml@v2.3.1
uses: entur/gha-terraform/.github/workflows/plan.yml@v2.5.0
with:
environment: tst

Expand All @@ -136,7 +136,7 @@ jobs:
if: ${{ !cancelled() && !contains(needs.*.result, 'failure') && needs.tf-plan-tst.outputs.has_changes == 'true' }}
needs: [ tf-plan-tst, tf-approval-tst ]
name: Terraform Apply TST
uses: entur/gha-terraform/.github/workflows/apply.yml@v2.3.1
uses: entur/gha-terraform/.github/workflows/apply.yml@v2.5.0
with:
environment: tst
has_changes: ${{ needs.tf-plan-tst.outputs.has_changes }}
Expand All @@ -145,7 +145,7 @@ jobs:
deploy-tst:
if: ${{ !cancelled() && !contains(needs.*.result, 'failure') && github.ref == 'refs/heads/master' }}
needs: [ approval-tst, tf-plan-tst, tf-apply-tst, docker-push ]
uses: entur/gha-helm/.github/workflows/deploy.yml@v1.6.1
uses: entur/gha-helm/.github/workflows/deploy.yml@v1.7.0
with:
environment: tst
image: ${{ needs.docker-push.outputs.image_name }}:${{ needs.docker-push.outputs.image_tag}}
Expand All @@ -170,7 +170,7 @@ jobs:
if: ${{ !cancelled() && !contains(needs.*.result, 'failure') }}
needs: [ terraform-lint, approval-prd ]
name: Terraform Plan PRD
uses: entur/gha-terraform/.github/workflows/plan.yml@v2.3.1
uses: entur/gha-terraform/.github/workflows/plan.yml@v2.5.0
with:
environment: prd

Expand All @@ -189,7 +189,7 @@ jobs:
if: ${{ !cancelled() && !contains(needs.*.result, 'failure') && needs.tf-plan-prd.outputs.has_changes == 'true' }}
needs: [ tf-plan-prd, tf-approval-prd ]
name: Terraform Apply PRD
uses: entur/gha-terraform/.github/workflows/apply.yml@v2.3.1
uses: entur/gha-terraform/.github/workflows/apply.yml@v2.5.0
with:
environment: prd
has_changes: ${{ needs.tf-plan-prd.outputs.has_changes }}
Expand All @@ -198,7 +198,7 @@ jobs:
deploy-prd:
if: ${{ !cancelled() && !contains(needs.*.result, 'failure') && github.ref == 'refs/heads/master' }}
needs: [ approval-prd, tf-plan-prd, tf-apply-prd, docker-push ]
uses: entur/gha-helm/.github/workflows/deploy.yml@v1.6.1
uses: entur/gha-helm/.github/workflows/deploy.yml@v1.7.0
with:
environment: prd
image: ${{ needs.docker-push.outputs.image_name }}:${{ needs.docker-push.outputs.image_tag}}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Inspired by: https://github.com/fabric8io/ipaas-quickstarts/

<properties>
<java.version>21</java.version>
<camel.version>4.4.5</camel.version>
<camel.version>4.22.0</camel.version>
<entur.helpers.version>5.50.0</entur.helpers.version>
<netex-java-model.version>2.0.16</netex-java-model.version>
<netex-parser-java.version>3.1.82</netex-parser-java.version>
Expand Down
Loading