Skip to content

Commit

Permalink
Merge pull request #228 from snyk/fix/circleci-main-branch
Browse files Browse the repository at this point in the history
fix: fixed main branch name in circleci config
  • Loading branch information
gemaxim authored May 17, 2024
2 parents bc7db9f + 06a7f6f commit af8a49e
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ orbs:
win: circleci/[email protected]
prodsec: snyk/[email protected]

filters_branches_ignore_master: &filters_branches_ignore_master
filters_branches_ignore_main: &filters_branches_ignore_main
filters:
branches:
ignore:
- master
- main

defaults: &defaults
parameters:
Expand Down Expand Up @@ -160,7 +160,7 @@ workflows:
name: Lint
context: nodejs-install
node_version: "16.13.2"
<<: *filters_branches_ignore_master
<<: *filters_branches_ignore_main
- test-windows-jest:
matrix:
alias: test-windows-jest
Expand All @@ -170,7 +170,7 @@ workflows:
context: nodejs-install
requires:
- Lint
<<: *filters_branches_ignore_master
<<: *filters_branches_ignore_main
- test-windows-tap:
matrix:
alias: test-windows-tap
Expand All @@ -180,7 +180,7 @@ workflows:
context: nodejs-install
requires:
- Lint
<<: *filters_branches_ignore_master
<<: *filters_branches_ignore_main
- test-unix-jest:
matrix:
alias: test-unix-jest
Expand All @@ -190,7 +190,7 @@ workflows:
context: nodejs-install
requires:
- Lint
<<: *filters_branches_ignore_master
<<: *filters_branches_ignore_main
- test-unix-tap:
matrix:
alias: test-unix-tap
Expand All @@ -200,12 +200,12 @@ workflows:
context: nodejs-install
requires:
- Lint
<<: *filters_branches_ignore_master
<<: *filters_branches_ignore_main
- release:
name: Release
context: nodejs-app-release
node_version: "16.13.2"
filters:
branches:
only:
- master
- main

0 comments on commit af8a49e

Please sign in to comment.