Skip to content

Commit 4f0ac5c

Browse files
Merge branch 'develop' into feature/RAA-8696
2 parents 881d3a4 + bdc5407 commit 4f0ac5c

10 files changed

Lines changed: 315 additions & 257 deletions

File tree

.github/workflows/combine-prs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
# Steps represent a sequence of tasks that will be executed as part of the job
4343
steps:
44-
- uses: actions/github-script@v8
44+
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
4545
id: create-combined-pr
4646
name: Create Combined PR
4747
with:

.github/workflows/continous-integration-workflow.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v5
11+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
1212
with:
1313
fetch-depth: 0 # This causes all history to be fetched, which is required for calculate-version to function
1414

1515
- name: Install Python 3.13
16-
uses: actions/setup-python@v6
16+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
1717
with:
1818
python-version: '3.13'
1919

@@ -34,7 +34,7 @@ jobs:
3434
- name: Create release (master only)
3535
id: create-release
3636
if: github.ref == 'refs/heads/master'
37-
uses: actions/create-release@v1
37+
uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # v1.1.4
3838
continue-on-error: true
3939
env:
4040
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

azure/azure-release-pipeline.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,21 @@ extends:
9999
smoke_tests: true
100100
depends_on:
101101
- ers_manual_approval_int
102+
- environment: manual-approval
103+
stage_name: ers_manual_approval_testdev
104+
- environment: internal-dev
105+
stage_name: ers_testdev_release
106+
service_name: "${{ variables.service_name }}-testdev"
107+
short_service_name: "${{ variables.short_service_name }}-testdev"
108+
service_base_path: "${{ variables.service_base_path }}-testdev"
109+
jinja_templates:
110+
ERS_TARGET_SERVER: e-referrals-service-api--testdev
111+
post_deploy:
112+
- template: templates/run-tests.yml
113+
parameters:
114+
smoke_tests: true
115+
depends_on:
116+
- ers_manual_approval_testdev
102117
- environment: manual-approval
103118
stage_name: ers_manual_approval_dep
104119
- environment: dev

manifest_template.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ APIGEE_ENVIRONMENTS:
3535
- name: ftxxii-internal-dev
3636
display_name: Internal Development - ft22
3737
euo_allowlist_required: false
38+
- name: testdev-internal-dev
39+
display_name: Internal Development - testdev
40+
euo_allowlist_required: false
3841

3942
- name: internal-dev-sandbox
4043
variants:

package-lock.json

Lines changed: 12 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)