actions/mawesome
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(release): v1.0.22

Browse Source
This commit is contained in:
Conventional Changelog Action 2021-01-16 11:46:23 +00:00
parent edb4a38f6b
commit 3f667388f1
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CHANGELOG.md
View File

@ -1,5 +1,12 @@
## <small>1.0.22 (2021-01-16)</small>
* fix: git pull strategy ([edb4a38](https://github.com/simonecorsi/mawesome/commit/edb4a38))
## <small>1.0.21 (2021-01-16)</small> ## <small>1.0.21 (2021-01-16)</small>
* chore(release): v1.0.21 ([3c3ab0a](https://github.com/simonecorsi/mawesome/commit/3c3ab0a))
* fix: added latest tag at release ([6b8b525](https://github.com/simonecorsi/mawesome/commit/6b8b525)) * fix: added latest tag at release ([6b8b525](https://github.com/simonecorsi/mawesome/commit/6b8b525))
@ -25,10 +32,3 @@
## <small>1.0.17 (2021-01-16)</small>
* chore(release): v1.0.17 ([380a0ec](https://github.com/simonecorsi/mawesome/commit/380a0ec))
* fix: exit condition ([914a115](https://github.com/simonecorsi/mawesome/commit/914a115))

3
index.js
View File

@ -21289,7 +21289,7 @@ exports.default = new (class Git {
this.add = (file) => this.exec(`add ${file}`); this.add = (file) => this.exec(`add ${file}`);
this.commit = (message) => this.exec(`commit -m "${message}"`); this.commit = (message) => this.exec(`commit -m "${message}"`);
this.pull = () => __awaiter(this, void 0, void 0, function* () { this.pull = () => __awaiter(this, void 0, void 0, function* () {
const args = ['pull']; const args = ['pull', 'origin', branch];
// Check if the repo is unshallow // Check if the repo is unshallow
if (yield this.isShallow()) { if (yield this.isShallow()) {
args.push('--unshallow'); args.push('--unshallow');
@ -21310,6 +21310,7 @@ exports.default = new (class Git {
// Set config // Set config
this.config('user.name', 'GitHub Actions'); this.config('user.name', 'GitHub Actions');
this.config('user.email', 'actions@users.noreply.github.com'); this.config('user.email', 'actions@users.noreply.github.com');
this.config('pull.rebase', 'false');
// Update the origin // Update the origin
this.updateOrigin(`https://x-access-token:${githubToken}@github.com/${GITHUB_REPOSITORY}.git`); this.updateOrigin(`https://x-access-token:${githubToken}@github.com/${GITHUB_REPOSITORY}.git`);
} }

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mawesome", "name": "mawesome",
"version": "1.0.21", "version": "1.0.22",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {