Skip to content
This repository was archived by the owner on May 15, 2021. It is now read-only.

Commit ce9a0c3

Browse files
Merge pull request #5 from technote-space/release/next-v1.0.1
release: v1.1.0
2 parents b8b6513 + 5445670 commit ce9a0c3

File tree

5 files changed

+22
-17
lines changed

5 files changed

+22
-17
lines changed

__tests__/process.test.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ describe('execute', () => {
2525
testEnv(rootDir);
2626

2727
it('should do nothing 1', async() => {
28+
process.env.INPUT_EXCLUDE_MERGED = 'true';
29+
2830
const mockStdout = spyOnStdout();
2931

3032
await execute(new Logger(), getOctokit(), generateContext({owner: 'hello', repo: 'world', event: 'push'}, {
@@ -101,7 +103,8 @@ describe('execute', () => {
101103
});
102104

103105
it('should cancel jobs', async() => {
104-
process.env.GITHUB_RUN_ID = '30433645';
106+
process.env.INPUT_EXCLUDE_MERGED = 'true';
107+
process.env.GITHUB_RUN_ID = '30433645';
105108

106109
const mockStdout = spyOnStdout();
107110
nock('https://api.github.com')

__tests__/utils/workflow.test.ts

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ describe('getWorkflowRuns', () => {
4343
testEnv(rootDir);
4444

4545
it('should get workflow runs', async() => {
46+
process.env.INPUT_EXCLUDE_MERGED = 'true';
47+
4648
const fn = jest.fn();
4749
nock('https://api.github.com')
4850
.get('/repos/hello/world/actions/workflows/123/runs?status=in_progress&event=push')

action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ inputs:
1212
EXCLUDE_MERGED:
1313
description: Whether to exclude merge push.
1414
required: false
15-
default: 'true'
15+
default: 'false'
1616
MERGE_MESSAGE_PREFIX:
1717
description: Prefix to detect merge message.
1818
required: false

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@technote-space/auto-cancel-redundant-job",
3-
"version": "1.0.1",
3+
"version": "1.1.0",
44
"description": "GitHub Actions to automatically cancel redundant jobs.",
55
"author": {
66
"name": "Technote",

yarn.lock

+14-14
Original file line numberDiff line numberDiff line change
@@ -583,9 +583,9 @@
583583
universal-user-agent "^4.0.0"
584584

585585
"@octokit/types@^2.0.0", "@octokit/types@^2.0.1":
586-
version "2.3.2"
587-
resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.3.2.tgz#63c1a786c65236a8b059024d0343353e260d5215"
588-
integrity sha512-3nyOEch20ISn6MbVt/mBeDOkxO4ljx3oV+CnYNUT8n0JtUuMs0LpewZXpZ4ZWarI72qKc/YkxK9dkfjpncxuvg==
586+
version "2.4.0"
587+
resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.4.0.tgz#857c6e5e5983dc034a0b9150684062bfdebd87dd"
588+
integrity sha512-RxVKYIFUZti2POYxeASCSjj0JxtHvjlcFwpZnXQ7aDGDgkpzpve/qhQSR/nEw8zALRFiSuh9BP71AYL0rcV28A==
589589
dependencies:
590590
"@types/node" ">= 8"
591591

@@ -833,7 +833,7 @@ acorn@^6.0.1:
833833
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
834834
integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
835835

836-
acorn@^7.1.0:
836+
acorn@^7.1.0, acorn@^7.1.1:
837837
version "7.1.1"
838838
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
839839
integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
@@ -1811,11 +1811,11 @@ eslint@^6.8.0:
18111811
v8-compile-cache "^2.0.3"
18121812

18131813
espree@^6.1.2:
1814-
version "6.2.0"
1815-
resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.0.tgz#349fef01a202bbab047748300deb37fa44da79d7"
1816-
integrity sha512-Xs8airJ7RQolnDIbLtRutmfvSsAe0xqMMAantCN/GMoqf81TFbeI1T7Jpd56qYu1uuh32dOG5W/X9uO+ghPXzA==
1814+
version "6.2.1"
1815+
resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
1816+
integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
18171817
dependencies:
1818-
acorn "^7.1.0"
1818+
acorn "^7.1.1"
18191819
acorn-jsx "^5.2.0"
18201820
eslint-visitor-keys "^1.1.0"
18211821

@@ -3563,9 +3563,9 @@ [email protected]:
35633563
integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
35643564

35653565
minimist@^1.1.1, minimist@^1.2.0:
3566-
version "1.2.0"
3567-
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
3568-
integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
3566+
version "1.2.3"
3567+
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.3.tgz#3db5c0765545ab8637be71f333a104a965a9ca3f"
3568+
integrity sha512-+bMdgqjMN/Z77a6NlY/I3U5LlRDbnmaAk6lDveAPKwSpcPM4tKAuYsvYF8xjhOPXhOYGe/73vVLVez5PW+jqhw==
35693569

35703570
mixin-deep@^1.2.0:
35713571
version "1.3.2"
@@ -5296,9 +5296,9 @@ y18n@^4.0.0:
52965296
integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
52975297

52985298
yaml@^1.7.2:
5299-
version "1.8.0"
5300-
resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.8.0.tgz#169fbcfa2081302dc9441d02b0b6fe667e4f74c9"
5301-
integrity sha512-6qI/tTx7OVtA4qNqD0OyutbM6Z9EKu4rxWm/2Y3FDEBQ4/2X2XAnyuRXMzAE2+1BPyqzksJZtrIwblOHg0IEzA==
5299+
version "1.8.2"
5300+
resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.8.2.tgz#a29c03f578faafd57dcb27055f9a5d569cb0c3d9"
5301+
integrity sha512-omakb0d7FjMo3R1D2EbTKVIk6dAVLRxFXdLZMEUToeAvuqgG/YuHMuQOZ5fgk+vQ8cx+cnGKwyg+8g8PNT0xQg==
53025302
dependencies:
53035303
"@babel/runtime" "^7.8.7"
53045304

0 commit comments

Comments
 (0)