tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Force all tests on main branch after testing on separate branch

This commit is contained in:
Guillaume Tardif 2020-08-11 16:01:13 +02:00
parent d884835ecb
commit 6e4f580b99
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/optional-ci.yml vendored
View File

@ -3,7 +3,7 @@ name: Continuous integration
on: on:
push: push:
branches: branches:
- test_optional_ci - main
pull_request: pull_request:
jobs: jobs:
@ -37,7 +37,7 @@ jobs:
env: env:
GO111MODULE: "on" GO111MODULE: "on"
needs: check-optional-tests needs: check-optional-tests
if: github.ref == 'refs/heads/test_optional_ci' || needs.check-optional-tests.outputs.trigger-aci == 'true' if: github.ref == 'refs/heads/main' || needs.check-optional-tests.outputs.trigger-aci == 'true'
steps: steps:
- name: Set up Go 1.14 - name: Set up Go 1.14
uses: actions/setup-go@v1 uses: actions/setup-go@v1
@ -69,7 +69,7 @@ jobs:
env: env:
GO111MODULE: "on" GO111MODULE: "on"
needs: check-optional-tests needs: check-optional-tests
if: github.ref == 'refs/heads/test_optional_ci' || needs.check-optional-tests.outputs.trigger-windows == 'true' if: github.ref == 'refs/heads/main' || needs.check-optional-tests.outputs.trigger-windows == 'true'
steps: steps:
- name: Set up Go 1.14 - name: Set up Go 1.14
uses: actions/setup-go@v1 uses: actions/setup-go@v1