Compare commits

...

8 Commits

Author SHA1 Message Date
peaceiris
90a40adfe5 chore(release): 3.5.4-2
Some checks failed
Release / release (push) Has been cancelled
2020-03-15 06:03:00 +09:00
peaceiris
d3e35b292a chore(release): Add build assets 2020-03-15 06:02:59 +09:00
peaceiris
c97a39a35f fix: skip logic 2020-03-14 21:02:35 +00:00
peaceiris
9df954b37b chore(release): Remove build assets [skip ci] 2020-03-15 05:51:59 +09:00
peaceiris
dea6ee7419 chore(release): 3.5.4-1
Some checks failed
Release / release (push) Has been cancelled
2020-03-15 05:51:59 +09:00
peaceiris
2ca4395141 chore(release): Add build assets 2020-03-15 05:51:58 +09:00
peaceiris
6546aa9608 fix: isForkRepository 2020-03-14 20:51:26 +00:00
peaceiris
a60eec20ec chore(release): Remove build assets [skip ci] 2020-03-15 05:47:00 +09:00
5 changed files with 36 additions and 14 deletions

View File

@@ -2,6 +2,24 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
## [3.5.4-2](https://github.com/peaceiris/actions-gh-pages/compare/v3.5.4-1...v3.5.4-2) (2020-03-14)
### fix
* skip logic ([c97a39a](https://github.com/peaceiris/actions-gh-pages/commit/c97a39a35f681badbf7490c2786eddf06b17316d))
## [3.5.4-1](https://github.com/peaceiris/actions-gh-pages/compare/v3.5.4-0...v3.5.4-1) (2020-03-14)
### fix
* isForkRepository ([6546aa9](https://github.com/peaceiris/actions-gh-pages/commit/6546aa96085e89bd91adc56f58be665766e93a1e))
## [3.5.4-0](https://github.com/peaceiris/actions-gh-pages/compare/v3.5.3...v3.5.4-0) (2020-03-14)

View File

@@ -2762,14 +2762,16 @@ function addCNAME(workDir, content) {
exports.addCNAME = addCNAME;
function skipOnFork(githubToken, deployKey, personalToken) {
return __awaiter(this, void 0, void 0, function* () {
const isForkRepository = github_1.context.payload.repository.fork.toUpperCase() === 'TRUE';
if (!isForkRepository || githubToken) {
return false;
const isForkRepository = github_1.context.payload.repository.fork === 'true';
if (isForkRepository && deployKey === '') {
core.warning('Action runs on fork and deploy_key is empty');
return true;
}
if (isForkRepository && (deployKey || personalToken)) {
return false;
if (isForkRepository && personalToken === '') {
core.warning('Action runs on fork and personalToken is empty');
return true;
}
return true;
return false;
});
}
exports.skipOnFork = skipOnFork;

2
package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "actions-github-pages",
"version": "3.5.4-0",
"version": "3.5.4-2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@@ -1,6 +1,6 @@
{
"name": "actions-github-pages",
"version": "3.5.4-0",
"version": "3.5.4-2",
"description": "GitHub Actions for GitHub Pages",
"main": "lib/index.js",
"engines": {

View File

@@ -71,15 +71,17 @@ export async function skipOnFork(
): Promise<boolean> {
const isForkRepository =
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(context.payload as any).repository.fork.toUpperCase() === 'TRUE';
(context.payload as any).repository.fork === 'true';
if (!isForkRepository || githubToken) {
return false;
if (isForkRepository && deployKey === '') {
core.warning('Action runs on fork and deploy_key is empty');
return true;
}
if (isForkRepository && (deployKey || personalToken)) {
return false;
if (isForkRepository && personalToken === '') {
core.warning('Action runs on fork and personalToken is empty');
return true;
}
return true;
return false;
}