lib/takelage/default.yml in takelage-0.22.0 vs lib/takelage/default.yml in takelage-0.22.1
- old
+ new
@@ -12,12 +12,12 @@
cmd_bit_clipboard_copy_bit_add_dir: 'bit add --skip-update --id %{id} --main %{dir}/README.bit %{dir}'
cmd_bit_clipboard_copy_bit_tag_id: 'bit tag --skip-update --skip-tests %{id}'
cmd_bit_clipboard_copy_bit_export_to_scope: 'bit export --skip-update %{scope}'
cmd_bit_clipboard_git_add: 'git add %{file}'
cmd_bit_clipboard_git_commit: 'git commit --message="%{message}"'
-cmd_bit_clipboard_git_pull: 'git pull origin master'
-cmd_bit_clipboard_git_push: 'git push origin master'
+cmd_bit_clipboard_git_pull: 'git pull origin %{main}'
+cmd_bit_clipboard_git_push: 'git push origin %{main}'
cmd_bit_clipboard_paste_bit_list_scope: 'bit list --skip-update --json %{scope}'
cmd_bit_clipboard_paste_bit_import_cid: 'bit import --ignore-package-json --ignore-dist --skip-update --path %{dir} %{cid}'
cmd_bit_clipboard_pull_bit_import_all: 'bit import --ignore-package-json --ignore-dist --skip-update'
cmd_bit_clipboard_pull_bit_checkout_all: 'bit checkout --ignore-package-json --ignore-dist --skip-update --skip-npm-install --all latest'
cmd_bit_clipboard_push_bit_tag_all: 'bit tag --skip-update --skip-tests --all'
@@ -52,11 +52,11 @@
cmd_docker_socket_stop_docker_socket_ps: 'sudo ps a -o pid,command'
cmd_docker_socket_stop_docker_socket_kill: 'sudo kill -SIGTERM %{pid}'
cmd_git_check_clean_git_unstaged: 'git diff --exit-code'
cmd_git_check_clean_git_uncommitted: 'git diff --cached --exit-code'
cmd_git_check_clean_git_status: 'git status --porcelain'
-cmd_git_check_master_git_branch: 'git symbolic-ref HEAD'
+cmd_git_check_main_git_branch: 'git symbolic-ref HEAD'
cmd_git_check_workspace_git_repo: 'git -C . rev-parse'
cmd_git_check_workspace_pwd: 'pwd'
docker_debug: 'ansible/roles/takel-takelage/files/takelscripts'
docker_entrypoint_extra: '.config/gcloud'
docker_entrypoint_options: ''
@@ -66,7 +66,8 @@
docker_shm_size: '512M'
docker_socket_gpg_agent_port: 17874
docker_socket_gpg_ssh_agent_port: 17875
docker_tag: 'latest'
docker_user: 'takelage'
+git_main_branch: 'main'
info_project_main: 'project.yml'
info_project_private: 'private/project.yml'