Merge branch 'master' into develop

This commit is contained in:
Rory Powell 2022-06-20 10:40:38 +01:00
commit 5b8532a30b
1 changed files with 6 additions and 6 deletions

View File

@ -4,7 +4,7 @@ concurrency: release-develop
on: on:
push: push:
branches: branches:
- release - develop
paths: paths:
- '.aws/**' - '.aws/**'
- '.github/**' - '.github/**'
@ -28,11 +28,11 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
# - name: Fail if branch is not develop - name: Fail if branch is not develop
# if: github.ref != 'refs/heads/develop' if: github.ref != 'refs/heads/develop'
# run: | run: |
# echo "Ref is not develop, you must run this job from develop." echo "Ref is not develop, you must run this job from develop."
# exit 1 exit 1
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/setup-node@v1 - uses: actions/setup-node@v1
with: with: