Skip to content

Commit

Permalink
Merge pull request #1778 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu authored Sep 26, 2023
2 parents f0da5d4 + 5f041ba commit a616eea
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 18 deletions.
5 changes: 1 addition & 4 deletions src/plugin/tasks/circleci/snippets/base.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
workflows:
version: 2

version: 2
version: 2.1
3 changes: 1 addition & 2 deletions src/plugin/tasks/circleci/snippets/serverless/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
workflows:
version: 2
node-multi-build:
jobs:
- gally
Expand Down Expand Up @@ -32,7 +31,7 @@ workflows:
- ${file(^/workflow/filter.yml), branch=master}


version: 2
version: 2.1
jobs:
gally:
${file(^/jobs/gally.yml)}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
workflows:
version: 2
node-multi-build:
jobs:
- gally-create-pr
Expand Down Expand Up @@ -30,7 +29,7 @@ workflows:
filters:
branches:
only: master
version: 2
version: 2.1
jobs:
gally-create-pr:
docker:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
workflows:
version: 2
node-multi-build:
jobs:
- gally-create-pr
Expand Down Expand Up @@ -30,7 +29,7 @@ workflows:
filters:
branches:
only: master
version: 2
version: 2.1
jobs:
gally-create-pr:
docker:
Expand Down
3 changes: 1 addition & 2 deletions test/projects/assorted/@npm-opensource/.circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
workflows:
version: 2
node-multi-build:
jobs:
- gally-create-pr
Expand Down Expand Up @@ -30,7 +29,7 @@ workflows:
filters:
branches:
only: master
version: 2
version: 2.1
jobs:
gally-create-pr:
docker:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
workflows:
version: 2
node-multi-build:
jobs:
- gally
Expand Down Expand Up @@ -57,7 +56,7 @@ workflows:
branches:
only:
- master
version: 2
version: 2.1
jobs:
gally:
docker:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
workflows:
version: 2
node-multi-build:
jobs:
- gally
Expand Down Expand Up @@ -57,7 +56,7 @@ workflows:
branches:
only:
- master
version: 2
version: 2.1
jobs:
gally:
docker:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
workflows:
version: 2
node-multi-build:
jobs:
- gally
Expand Down Expand Up @@ -57,7 +56,7 @@ workflows:
branches:
only:
- master
version: 2
version: 2.1
jobs:
gally:
docker:
Expand Down

0 comments on commit a616eea

Please sign in to comment.