Skip to content

Commit

Permalink
ci: migrate orb tools 12 (#126)
Browse files Browse the repository at this point in the history
Co-authored-by: Kyle a.k.a. TechSquidTV <[email protected]>
  • Loading branch information
EricRibeiro and KyleTryon authored May 11, 2023
1 parent 0cdb97d commit c4baca6
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 29 deletions.
20 changes: 7 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1
setup: true
orbs:
orb-tools: circleci/orb-tools@11.1
orb-tools: circleci/orb-tools@12.0
shellcheck: circleci/[email protected]

filters: &filters
Expand All @@ -16,21 +16,15 @@ workflows:
- orb-tools/pack:
filters: *filters
- orb-tools/review:
exclude: RC010
filters: *filters
- shellcheck/check:
exclude: SC2148,SC2038,SC2086,SC2002,SC2016
filters: *filters
- orb-tools/publish:
orb-name: circleci/ruby
vcs-type: << pipeline.project.type >>
requires:
[orb-tools/lint, orb-tools/review, orb-tools/pack, shellcheck/check]
# Use a context to hold your publishing token.
context: orb-publisher
exclude: SC2086,SC2016,SC2002
filters: *filters
# Triggers the next workflow in the Orb Development Kit.
- orb-tools/continue:
pipeline-number: << pipeline.number >>
vcs-type: << pipeline.project.type >>
requires: [orb-tools/publish]
orb_name: ruby
pipeline_number: << pipeline.number >>
vcs_type: << pipeline.project.type >>
requires: [orb-tools/lint, orb-tools/review, orb-tools/pack, shellcheck/check]
filters: *filters
36 changes: 20 additions & 16 deletions .circleci/test-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
version: 2.1
orbs:
ruby: circleci/ruby@dev:<<pipeline.git.revision>>
orb-tools: circleci/[email protected]
orb-tools: circleci/[email protected]
ruby: {}

filters: &filters
tags:
only: /.*/

release-filters: &release-filters
branches:
ignore: /.*/
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+$/

executors:
ubuntu:
parameters:
image:
description: Enter the version that should be user for the machine executor.
type: string
machine:
type: string
machine:
image: << parameters.image >>

jobs:
Expand All @@ -26,7 +32,7 @@ jobs:
version: 2.7.6
- ruby/install-deps:
app-dir: sample
- ruby/rspec-test:
- ruby/rspec-test:
app-dir: sample
integration-tests:
docker:
Expand Down Expand Up @@ -86,8 +92,8 @@ jobs:
parameters:
image:
description: Enter the version that should be used for the machine executor.
type: string
executor:
type: string
executor:
name: ubuntu
image: << parameters.image >>
steps:
Expand Down Expand Up @@ -136,11 +142,13 @@ workflows:
- install-from-env-var:
filters: *filters
- orb-tools/pack:
filters: *filters
filters: *release-filters
- orb-tools/publish:
orb-name: circleci/ruby
vcs-type: << pipeline.project.type >>
pub-type: production
orb_name: circleci/ruby
vcs_type: << pipeline.project.type >>
pub_type: production
enable_pr_comment: true
github_token: GHI_TOKEN
requires:
- orb-tools/pack
- integration-tests
Expand All @@ -149,8 +157,4 @@ workflows:
- install-from-env-var
- test-openssl-3
context: orb-publisher
filters:
branches:
ignore: /.*/
tags:
only: /^v[0-9]+\.[0-9]+\.[0-9]+$/
filters: *release-filters

0 comments on commit c4baca6

Please sign in to comment.