Merge branch 'main' of github.com:simonecorsi/mawesome into main

This commit is contained in:
GitHub Actions 2021-01-22 15:23:53 +01:00
commit fb228f6b20
4 changed files with 18 additions and 12 deletions

View File

@ -1,5 +1,12 @@
## <small>1.0.31 (2021-01-21)</small>
* feat: added user/email input for commiting ([58a7dc1](https://github.com/simonecorsi/mawesome/commit/58a7dc1))
## <small>1.0.30 (2021-01-16)</small>
* chore(release): v1.0.30 ([a5f15da](https://github.com/simonecorsi/mawesome/commit/a5f15da))
* fix: removed push ([7f42ca0](https://github.com/simonecorsi/mawesome/commit/7f42ca0))
@ -27,10 +34,3 @@
## <small>1.0.26 (2021-01-16)</small>
* chore: added link to project ([0543c05](https://github.com/simonecorsi/mawesome/commit/0543c05))
* chore(release): v1.0.26 ([8bc2714](https://github.com/simonecorsi/mawesome/commit/8bc2714))

View File

@ -21308,9 +21308,11 @@ class Git {
this.createTag = (tag) => this.exec(`tag -a ${tag} -m "${tag}"`);
const githubToken = core.getInput('github-token', { required: true });
core.setSecret(githubToken);
const githubName = core.getInput('github-name') || 'GitHub Actions';
const githubEmail = core.getInput('github-email') || 'actions@users.noreply.github.com';
// Set config
this.config('user.name', 'GitHub Actions');
this.config('user.email', 'actions@users.noreply.github.com');
this.config('user.name', githubName);
this.config('user.email', githubEmail);
this.config('pull.rebase', 'false');
// Update the origin
this.updateOrigin(`https://x-access-token:${githubToken}@github.com/${GITHUB_REPOSITORY}.git`);

View File

@ -1,6 +1,6 @@
{
"name": "mawesome",
"version": "1.0.30",
"version": "1.0.31",
"description": "Generate awesome list from user starred repositories",
"main": "index.js",
"author": "Simone Corsi<simonecorsi.dev@gmail.com>",

View File

@ -11,9 +11,13 @@ class Git {
const githubToken = core.getInput('github-token', { required: true });
core.setSecret(githubToken);
const githubName = core.getInput('github-name') || 'GitHub Actions';
const githubEmail =
core.getInput('github-email') || 'actions@users.noreply.github.com';
// Set config
this.config('user.name', 'GitHub Actions');
this.config('user.email', 'actions@users.noreply.github.com');
this.config('user.name', githubName);
this.config('user.email', githubEmail);
this.config('pull.rebase', 'false');
// Update the origin