Skip to content
This repository has been archived by the owner on Mar 24, 2023. It is now read-only.

Commit

Permalink
we only care about the upstream, not the branch
Browse files Browse the repository at this point in the history
  • Loading branch information
laverya committed Mar 25, 2019
1 parent b9c638d commit 6e9398f
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ jobs:
fi
# todo drop a release-api message to bump a version in the DB

is_upstream_master:
is_upstream:
docker:
- image: circleci/golang:1.10
working_directory: /go/src/github.com/replicatedhq/ship
Expand All @@ -503,10 +503,6 @@ jobs:
echo "refusing to build fork \"${CIRCLE_PROJECT_USERNAME}\""
exit 1
fi
if [ "${CIRCLE_BRANCH}" != "master" ]; then
echo "refusing to build branch \"${CIRCLE_BRANCH}\""
exit 1
fi
workflows:
version: 2
Expand Down Expand Up @@ -543,7 +539,7 @@ workflows:
- integration_update
- ui

- is_upstream_master:
- is_upstream:
filters:
branches:
only: /master/
Expand All @@ -556,7 +552,7 @@ workflows:
- e2e_setup
- e2e_init
- ui
- is_upstream_master
- is_upstream
filters:
branches:
only: /master/
Expand All @@ -574,7 +570,7 @@ workflows:
- integration_init_app
- integration_update
- ui
- is_upstream_master
- is_upstream
filters:
branches:
only: /master/
Expand Down Expand Up @@ -688,7 +684,7 @@ workflows:
branches:
ignore: /.*/

- is_upstream_master:
- is_upstream:
filters:
tags:
only: /^v[0-9]+(\.[0-9]+)*(-.*)*/
Expand All @@ -709,7 +705,7 @@ workflows:
- integration_update
- ui
- docs
- is_upstream_master
- is_upstream
filters:
tags:
only: /^v[0-9]+(\.[0-9]+)*(-.*)*/
Expand Down

0 comments on commit 6e9398f

Please sign in to comment.