Merge branch 'tmessi-hooks' (#1593)

This commit is contained in:
Timothy Messier committed 2021-10-15 14:24:20 -04:00
commit 65f72ce3d0
5 files changed
+63

No files matched your search

+18
View File
@@ -1192,6 +1192,17 @@ jobs:
name: Save package cache
paths:
- .buildcache/packages/store
trigger-merge-to-ent:
machine:
image: ubuntu-2004:202107-02
resource_class: medium
working_directory: ~/boundary
steps:
- checkout
- run:
command: |
./scripts/trigger-merge-to-ent
name: Trigger Merge to Enterprise
openbsd_amd64_package:
docker:
- image: docker.mirror.hashicorp.services/circleci/buildpack-deps
@@ -1569,4 +1580,11 @@ workflows:
branches:
only:
- stable-website
trigger-merge-to-ent:
jobs:
- trigger-merge-to-ent:
filters:
branches:
only:
- main
version: 2
@@ -0,0 +1,7 @@
executor: go-machine-medium
steps:
- checkout
- run:
name: "Trigger Merge to Enterprise"
command: |
./scripts/trigger-merge-to-ent
@@ -0,0 +1,6 @@
jobs:
- trigger-merge-to-ent:
filters:
branches:
only:
- main
+15
View File
@@ -0,0 +1,15 @@
#!/usr/bin/env bash
remote="$1"
remote_url=$(git remote get-url $remote)
if [[ $remote_url == *"boundary-enterprise"* ]]; then
exit 0
fi
if [ -f cmd/boundary/package_registration_ent.go ]; then
echo "Found enterprise file while pushing to oss remote"
exit 1
fi
exit 0
+17
View File
@@ -0,0 +1,17 @@
#!/usr/bin/env bash
if [[ -z "${CIRCLE_REPOSITORY_URL}" ]]; then
exit 0
fi
if [[ "${CIRCLE_REPOSITORY_URL}" == *"boundary-enterprise"* ]]; then
exit 0
fi
if [[ -z ${CIRCLE_CI_ENT_TOK} ]]; then
exit 0
fi
curl -u ${CIRCLE_CI_ENT_TOK}: \
-d 'build_parameters[CIRCLE_JOB]=merge-oss-main' \
https://circleci.com/api/v1.1/project/github/hashicorp/boundary-enterprise/tree/main