Skip to content

Commit 5ea7288

Browse files
Merge branch 'master' into FLAGSAPI-806-convert-date-value-1-to-default-date
2 parents 0ff28e5 + 4a40116 commit 5ea7288

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/continuous-integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ jobs:
3636
run: pip install poetry
3737

3838
- name: Cache poetry packages
39-
uses: actions/cache@v1
39+
uses: actions/cache@v4
4040
with:
4141
path: ~/.cache/pypoetry
4242
key: ${{ runner.os }}-build-cache-poetry-packages-${{ hashFiles('**/poetry.lock') }}
4343

4444
- name: Cache node modules
45-
uses: actions/cache@v1
45+
uses: actions/cache@v4
4646
with:
4747
path: ~/.npm
4848
key: ${{ runner.os }}-build-cache-npm-packages-${{ hashFiles('**/package-lock.json') }}

.github/workflows/pr-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- name: Check ticket name conforms to requirements
8-
run: echo ${{ github.event.pull_request.head.ref }} | grep -i -E -q "((apm|niad|amb)-[0-9]+)|(dependabot\/)"
8+
run: echo ${{ github.event.pull_request.head.ref }} | grep -i -E -q "((apm|niad|amb|flagsapi)-[0-9]+)|(dependabot\/)"
99

1010
- name: Grab ticket name
1111
if: contains(github.event.pull_request.head.ref, 'apm-') || contains(github.event.pull_request.head.ref, 'APM-') || contains(github.event.pull_request.head.ref, 'niad-') || contains(github.event.pull_request.head.ref, 'NIAD-') || contains(github.event.pull_request.head.ref, 'amb-') || contains(github.event.pull_request.head.ref, 'AMB-')

0 commit comments

Comments
 (0)