Skip to content

Commit

Permalink
attempt migrating to v12
Browse files Browse the repository at this point in the history
  • Loading branch information
ELD committed May 13, 2023
1 parent e9187ec commit cc6fa46
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
11 changes: 6 additions & 5 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.6.1
orb-tools: circleci/orb-tools@12.0.2

executors:
linux:
Expand Down Expand Up @@ -35,21 +35,22 @@ workflows:
tags:
only: /.*/
- orb-tools/publish:
orb-name: eld/nix
orb_name: eld/nix
requires:
- orb-tools/lint
- orb-tools/pack
- orb-tools/review
vcs-type: << pipeline.project.type >>
vcs_type: << pipeline.project.type >>
# Use a context to hold your publishing token.
context: orb-publishing
filters:
tags:
only: /.*/
# Triggers the next workflow in the Orb Development Kit.
- orb-tools/continue:
pipeline-number: << pipeline.number >>
vcs-type: << pipeline.project.type >>
orb_name: eld/nix
pipeline_number: << pipeline.number >>
vcs_type: << pipeline.project.type >>
requires: [orb-tools/publish]
filters:
tags:
Expand Down
13 changes: 6 additions & 7 deletions .circleci/test-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
version: 2.1
orbs:
nix: eld/nix@dev:<<pipeline.git.revision>>
orb-tools: circleci/[email protected]
orb-tools: circleci/[email protected]

executors:
linux:
Expand Down Expand Up @@ -49,15 +48,15 @@ workflows:
only: /.*/
context: nix
- orb-tools/publish:
orb-name: eld/nix
orb_name: eld/nix
requires:
- test-nix-install
- orb-tools/lint
- orb-tools/review
- orb-tools/pack
context: orb-publishing
vcs-type: << pipeline.project.type >>
pub-type: production
vcs_type: << pipeline.project.type >>
pub_type: production
filters:
tags:
only: /^v.*/
Expand All @@ -75,8 +74,8 @@ jobs:
steps:
- checkout
- nix/install
- nix/install-cachix
- nix/with-cachix:
- nix/install_cachix
- nix/with_cachix:
cachix-user: eld
nix-command: nix profile install nixpkgs#cowsay.out
- run:
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ steps:
CACHIX_USER: << parameters.cachix-user >>
NIX_COMMAND: << parameters.nix-command >>
CACHE_NAME: << parameters.cache-name >>
command: << include(scripts/with-cachix.sh) >>
command: << include(scripts/with_cachix.sh) >>

0 comments on commit cc6fa46

Please sign in to comment.