Skip to content

Commit 281ab50

Browse files
Cleanup branch.
1 parent 7ae4e92 commit 281ab50

1 file changed

Lines changed: 5 additions & 19 deletions

File tree

.github/workflows/release-and-deploy-bfd.yml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ on:
2323
options:
2424
- us-east-1
2525
- us-west-2
26-
required: false
27-
push:
28-
branches:
29-
- feature/BFD-4248_GitHub-BuildAndDeploy-Slack-Notification
30-
26+
required: true
3127
permissions:
3228
id-token: write # This is required for requesting the AWS IAM OIDC JWT
3329
contents: write # This is required for actions/checkout
@@ -68,8 +64,7 @@ jobs:
6864
build-release:
6965
needs: notify-start
7066
if: ${{ github.ref_name == github.event.repository.default_branch }}
71-
# uses: ./.github/workflows/build-release.yml
72-
uses: ./.github/workflows/dummy-build-release.yml
67+
uses: ./.github/workflows/build-release.yml
7368
with:
7469
releaseVersion: ${{ inputs.release-version }}
7570
developmentVersion: ${{ inputs.development-version }}
@@ -80,14 +75,8 @@ jobs:
8075
# DEPLOYMENTS
8176
# -------------------------
8277
deploy-platform:
83-
<<<<<<< HEAD
84-
# uses: ./.github/workflows/deploy-platform-services.yml
85-
uses: ./.github/workflows/dummy-deploy-platform-services.yml
86-
needs: build-release
87-
=======
8878
uses: ./.github/workflows/deploy-platform-services.yml
8979
needs: [build-release]
90-
>>>>>>> 2ced49338 (Retract unnecessary change so that it does't show up in the diff/changes.)
9180
strategy:
9281
matrix:
9382
account-type: ["prod", "non-prod"]
@@ -97,26 +86,23 @@ jobs:
9786
secrets: inherit
9887

9988
deploy-to-test:
100-
# uses: ./.github/workflows/deploy-env-services.yml
101-
uses: ./.github/workflows/dummy-deploy-env-services.yml
89+
uses: ./.github/workflows/deploy-env-services.yml
10290
needs: [build-release, deploy-platform]
10391
with:
10492
bfd-env: test
10593
git-ref: refs/tags/${{ needs.build-release.outputs.bfd_release }}
10694
secrets: inherit
10795

10896
deploy-to-sandbox:
109-
# uses: ./.github/workflows/deploy-env-services.yml
110-
uses: ./.github/workflows/dummy-deploy-env-services.yml
97+
uses: ./.github/workflows/deploy-env-services.yml
11198
needs: [build-release, deploy-to-test]
11299
with:
113100
bfd-env: sandbox
114101
git-ref: refs/tags/${{ needs.build-release.outputs.bfd_release }}
115102
secrets: inherit
116103

117104
deploy-to-prod:
118-
# uses: ./.github/workflows/deploy-env-services.yml
119-
uses: ./.github/workflows/dummy-deploy-env-services.yml
105+
uses: ./.github/workflows/deploy-env-services.yml
120106
needs: [build-release, deploy-to-sandbox]
121107
with:
122108
bfd-env: prod

0 commit comments

Comments
 (0)