Skip to content

Commit

Permalink
Merge branch 'master' into fix/ci-only-publishing-tags
Browse files Browse the repository at this point in the history
  • Loading branch information
Haroenv authored Jan 9, 2023
2 parents d62cbaa + e5b4fa6 commit 9286bc0
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
4 changes: 3 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,8 @@ jobs:
- run:
name: Trigger a release if the latest commit is a release commit
command: |
git config --global user.email "[email protected]"
git config --global user.name "InstantSearch[bot]"
yarn shipjs trigger
prepare release:
Expand All @@ -254,5 +256,5 @@ jobs:
name: Prepare a pull request for next release
command: |
git config --global user.email "[email protected]"
git config --global user.name "InstantSearch"
git config --global user.name "InstantSearch[bot]"
yarn run shipjs prepare --yes --no-browse
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
"rollup-plugin-replace": "2.2.0",
"rollup-plugin-uglify": "6.0.4",
"shelljs": "0.8.5",
"shipjs": "0.25.0",
"shipjs": "0.25.1",
"typescript": "4.3.5",
"@vue/vue3-jest": "27",
"@vue/vue2-jest": "27",
Expand Down
1 change: 0 additions & 1 deletion packages/create-instantsearch-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
},
"devDependencies": {
"jest-image-snapshot": "2.12.0",
"shipjs": "0.25.0",
"walk-sync": "2.0.2"
}
}
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -31410,21 +31410,21 @@ shiki@^0.11.1:
vscode-oniguruma "^1.6.1"
vscode-textmate "^6.0.0"

[email protected].0:
version "0.25.0"
resolved "https://registry.yarnpkg.com/shipjs-lib/-/shipjs-lib-0.25.0.tgz#1eb16ed094f9ec714fb42a7c2f35f3f807938e7b"
integrity sha512-EoaHpBHJdD6pcRQ+iKc1hIylP7ygJPMJ5Iaf8hG5XYi+3V74+bvG3rUP1EYOhX48X/H8rRsrpwRr3SoYNcj60g==
[email protected].1:
version "0.25.1"
resolved "https://registry.yarnpkg.com/shipjs-lib/-/shipjs-lib-0.25.1.tgz#584144befb58b2e7a1ef3c6f1426ef1320cf7fef"
integrity sha512-oxK+bnCTVLYl9xtDe5SnEsUi3qatqAECuMPUqkJqffmdUPkQtTIrHsxmeeblK+hCdu32cm6+JjPrYvSRTL8Zrw==
dependencies:
deepmerge "^4.2.2"
dotenv "^8.1.0"
parse-github-url "1.0.2"
semver "6.3.0"
shelljs "0.8.5"

[email protected].0:
version "0.25.0"
resolved "https://registry.yarnpkg.com/shipjs/-/shipjs-0.25.0.tgz#17080545aee33ad850ab3fed3afaf8a0e7b58140"
integrity sha512-8B+EJOk9zc3uBudXPqlf/Ok91mVzxJ2yBwAoHM3ohti0+3wnn1CRMA+PM9tLdxL4hEs3UGuYU3kT53+87D6hug==
[email protected].1:
version "0.25.1"
resolved "https://registry.yarnpkg.com/shipjs/-/shipjs-0.25.1.tgz#d69b7ee5d182d6dd1efa4ae227d62378d85e4202"
integrity sha512-xdZeZUH7klWaECEwrJLlIIexc9PfObz7JRwGpUgy0pCYgTKnQEFWVGzMAe1sL0PMLyWdLj9ZrBvsHNvZitBe7g==
dependencies:
"@babel/runtime" "^7.6.3"
"@octokit/rest" "^17.11.0"
Expand All @@ -31448,7 +31448,7 @@ [email protected]:
prettier "^2.0.0"
serialize-javascript "^3.0.0"
shell-quote "^1.7.2"
shipjs-lib "0.25.0"
shipjs-lib "0.25.1"
temp-write "4.0.0"
tempfile "^3.0.0"

Expand Down

0 comments on commit 9286bc0

Please sign in to comment.