CI: Run 'test' workflow as part of the 'deploy-branch' workflow
Mimics the behaviour of the 'deploy-release' workflow, even though branch deployment doesn't depend on Pico's tests to succeed. Pull requests still use the 'test' workflow directly.
This commit is contained in:
parent
9d08d4247a
commit
6f1fc9f8de
4
.github/workflows/deploy-branch.yml
vendored
4
.github/workflows/deploy-branch.yml
vendored
@ -12,6 +12,10 @@ env:
|
|||||||
CI_TOOLS_SETUP: https://raw.githubusercontent.com/picocms/ci-tools/master/setup.sh
|
CI_TOOLS_SETUP: https://raw.githubusercontent.com/picocms/ci-tools/master/setup.sh
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
test:
|
||||||
|
name: Test Pico CMS
|
||||||
|
uses: ./.github/workflows/test.yml
|
||||||
|
|
||||||
website:
|
website:
|
||||||
name: Update website for branch updates
|
name: Update website for branch updates
|
||||||
|
|
||||||
|
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
@ -1,8 +1,6 @@
|
|||||||
name: Test Pico CMS
|
name: Test Pico CMS
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
|
||||||
branches: [ 'master' ]
|
|
||||||
pull_request: {}
|
pull_request: {}
|
||||||
workflow_call: {}
|
workflow_call: {}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user