diff --git a/.circleci/config.yml b/.circleci/config.yml index f83c975..5c0b0c3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -41,7 +41,7 @@ jobs: command: | bundle exec rake test -t -v - func_test_master: + func_test_main: docker: - image: circleci/ruby:2.6.1-node-browsers working_directory: ~/repo @@ -52,7 +52,7 @@ jobs: - run: name: trigger command: | - .circleci/trigger_func_test.sh master + .circleci/trigger_func_test.sh main func_test_develop: docker: @@ -76,11 +76,11 @@ workflows: branches: ignore: - /^release\/.*/ - - master + - main - unit_test: requires: - build - - func_test_master: + - func_test_main: requires: - unit_test - func_test_develop: diff --git a/.circleci/trigger_func_test.sh b/.circleci/trigger_func_test.sh index 2c2e1c3..a08745a 100755 --- a/.circleci/trigger_func_test.sh +++ b/.circleci/trigger_func_test.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# trigger SCK 'master' branch to introduce this new image from this commit +# trigger SCK 'main' branch to introduce this new image from this commit # to working version of every other component. ORGANIZATION=splunk PROJECT=splunk-connect-for-kubernetes