Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: support newer stencil modulehook framework #2

Merged
merged 5 commits into from
Apr 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 72 additions & 42 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,61 +1,91 @@
# Please re-run stencil after any changes to this file.
version: 2.1

orbs:
shared: getoutreach/shared@1.55.2
shared: getoutreach/shared@1.60.0

# Extra contexts to expose to all jobs below
contexts: &contexts
### Start contexts inserted by other modules
### End contexts inserted by other modules
###Block(extraContexts)
- docker-registry
- ghaccesstoken
Comment on lines +11 to +12
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the docs publishing requires the confluence context

###EndBlock(extraContexts)

jobs:
{}
###Block(circleJobs)

###EndBlock(circleJobs)

release-dryrun:
executor:
name: shared/testbed-machine
resource_class: xlarge
steps:
- shared/setup_environment:
machine: true
- shared/with_go_cache
- shared/with_node_cache:
save: true
- run:
name: Release (Dry-run)
command: ./scripts/shell-wrapper.sh ci/release/dryrun.sh
- shared/save_go_cache

release:
executor:
name: shared/testbed-machine
resource_class: xlarge
steps:
- shared/setup_environment:
machine: true
- shared/with_go_cache
- shared/with_node_cache:
save: true
- run:
name: Release
command: ./scripts/shell-wrapper.sh ci/release/release.sh
- shared/save_go_cache
### Start jobs inserted by other modules
### End jobs inserted by other modules

workflows:
version: 2
###Block(circleWorkflows)

###EndBlock(circleWorkflows)
build_and_test:

### Start workflows inserted by other modules
### End workflows inserted by other modules
release_branch:
triggers:
- schedule:
cron: 0 0 15 * *
filters:
branches:
only:
- release
jobs:
- shared/merge:
head: release
base: main

release:
jobs:
- release-dryrun:
###Block(releaseDryrunConfig)
context: ghaccesstoken
###Block(circleWorkflowJobs)

###EndBlock(circleWorkflowJobs)
- shared/release: &release
dryrun: false
context: *contexts
###Block(circleReleaseExtra)

###EndBlock(circleReleaseExtra)
requires:
###Block(circleReleaseRequires)

###EndBlock(circleReleaseRequires)
- shared/test
filters:
branches:
only:
- master
- main
- release
# Dryrun release for PRs
- shared/release:
<<: *release
dryrun: true
filters:
branches:
ignore: main
###EndBlock(releaseDryrunConfig)
- release:
###Block(releaseConfig)
context: ghaccesstoken
ignore:
- master
- main
- release
- shared/test:
context: *contexts
app_name: stencil-circleci

- shared/publish_docs:
context: *contexts
filters:
branches:
only: main
###EndBlock(releaseConfig)
ignore: /.*/
tags:
only: /v[0-9]+(\.[0-9]+)*(-.*)*/
- shared/finalize-coverage:
context: *contexts
requires:
- shared/test
2 changes: 2 additions & 0 deletions .releaserc.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
preset: conventionalcommits
branches:
- name: main
prerelease: "rc"
- name: release
plugins:
- - "@semantic-release/commit-analyzer"
- releaseRules:
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

[![go.dev reference](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white)](https://engdocs.outreach.cloud/github.com/getoutreach/stencil-circleci)
[![Generated via Bootstrap](https://img.shields.io/badge/Outreach-Bootstrap-%235951ff)](https://github.com/getoutreach/bootstrap)
[![Coverage Status](https://coveralls.io/repos/github/getoutreach/stencil-circleci/badge.svg?branch=main)](https://coveralls.io/github//getoutreach/stencil-circleci?branch=main)

## Contributing

Expand Down
2 changes: 1 addition & 1 deletion bootstrap.lock
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
versions:
# HACK(jaredallard): Remove when stencil-base is cleaned up and bootstrap
# is dead.
devbase: v1.55.2
devbase: v1.58.1
90 changes: 0 additions & 90 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,93 +3,3 @@
module github.com/getoutreach/stencil-circleci

go 1.17

require github.com/getoutreach/stencil v1.9.1

require (
github.com/AlecAivazis/survey/v2 v2.3.2 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
github.com/Microsoft/go-winio v0.4.16 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
github.com/acomagu/bufpipe v1.0.3 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/bradleyjkemp/cupaloy v2.3.0+incompatible // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
github.com/danieljoos/wincred v1.1.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
github.com/facebookgo/limitgroup v0.0.0-20150612190941-6abd8d71ec01 // indirect
github.com/facebookgo/muster v0.0.0-20150708232844-fd3d7953fd52 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/getoutreach/gobox v1.34.0 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
github.com/go-git/go-billy/v5 v5.3.2-0.20210804024030-7ab80d7c013d // indirect
github.com/go-git/go-git/v5 v5.4.2 // indirect
github.com/godbus/dbus/v5 v5.0.4 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.7 // indirect
github.com/google/go-github/v43 v43.0.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/hashicorp/go-hclog v1.0.0 // indirect
github.com/hashicorp/go-plugin v1.4.3 // indirect
github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
github.com/honeycombio/beeline-go v1.4.1 // indirect
github.com/honeycombio/libhoney-go v1.15.8 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kevinburke/ssh_config v1.1.0 // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/manifoldco/promptui v0.9.0 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
github.com/mitchellh/copystructure v1.0.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 // indirect
github.com/mitchellh/reflectwalk v1.0.0 // indirect
github.com/oklog/run v1.0.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/schollz/progressbar/v3 v3.8.5 // indirect
github.com/sergi/go-diff v1.1.0 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/whilp/git-urls v1.0.0 // indirect
github.com/xanzy/ssh-agent v0.3.0 // indirect
github.com/zalando/go-keyring v0.1.1 // indirect
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
golang.org/x/net v0.0.0-20220401154927-543a649e0bdd // indirect
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea // indirect
google.golang.org/grpc v1.42.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gotest.tools/v3 v3.1.0 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading