Skip to content

Commit 5c24cc5

Browse files
authored
Merge pull request #434 from NHSDigital/APM-6800-Dependabotfix
APM-6800
2 parents 9b7c6d5 + 09e7579 commit 5c24cc5

7 files changed

Lines changed: 1302 additions & 965 deletions

File tree

.github/workflows/apigee-release-pipeline.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ defaults:
33
run:
44
shell: bash # Explicitly sets pipeline to fail if any subprocess fails
55
on:
6-
push
7-
permissions: read-all
6+
push:
7+
branches:
8+
- master
9+
permissions:
10+
contents: read
811

912
jobs:
1013
deploy-hello-world:
@@ -89,10 +92,10 @@ jobs:
8992
token="${token#\"}"
9093
echo "APIGEE_ACCESS_TOKEN=$token" >> $GITHUB_ENV
9194
92-
- name: Install Python 3.9
95+
- name: Install Python 3.13
9396
uses: actions/setup-python@v5
9497
with:
95-
python-version: 3.9
98+
python-version: 3.13
9699

97100
- name: Upgrade python packaging tools
98101
run: python -m pip install --upgrade pip cryptography

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
with:
1515
fetch-depth: 0 # This causes all history to be fetched, which is required for calculate-version to function
1616

17-
- name: Install Python 3.9
17+
- name: Install Python 3.13
1818
uses: actions/setup-python@v5
1919
with:
20-
python-version: 3.9
20+
python-version: 3.13
2121

2222
- name: Update apt repositories
2323
run: sudo apt update
@@ -49,10 +49,14 @@ jobs:
4949
- name: Check licenses
5050
run: make check-licenses
5151

52+
# - name: Set SPEC_VERSION env var
53+
# run: echo ::set-env name=SPEC_VERSION::$(poetry run python scripts/calculate_version.py)
54+
# env:
55+
# ACTIONS_ALLOW_UNSECURE_COMMANDS: true
56+
5257
- name: Set SPEC_VERSION env var
53-
run: echo ::set-env name=SPEC_VERSION::$(poetry run python scripts/calculate_version.py)
54-
env:
55-
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
58+
run: echo "SPEC_VERSION=$(poetry run python scripts/calculate_version.py)" >> "$GITHUB_ENV"
59+
5660

5761
- name: Create release (master only)
5862
id: create-release

.github/workflows/spec-release-pipeline.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ defaults:
44
shell: bash # Explicitly sets pipeline to fail if any subprocess fails
55
on:
66
push
7-
permissions: read-all
7+
permissions:
8+
contents: read
89

910
jobs:
1011
deploy-hello-world-spec:
@@ -38,10 +39,10 @@ jobs:
3839
echo PR number - $pr_number
3940
fi
4041
41-
- name: Install Python 3.9
42+
- name: Install Python 3.13
4243
uses: actions/setup-python@v5
4344
with:
44-
python-version: 3.9
45+
python-version: 3.13
4546

4647
- name: Install Proxygen client
4748
run: |

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The contents of this repository are protected by Crown Copyright (C).
3333

3434
### Proxygen
3535

36-
Hello World is the first API to use API Management's Proxygen to deploy the proxy, products, sandbox and spec through API calls.
36+
Hello World is the first API to use API Management's Proxygen to deploy the proxy, products, sandbox and spec through API calls.
3737

3838
The Proxygen API calls are handled by the Proxygen CLI
3939

0 commit comments

Comments
 (0)