Skip to content

Commit 8e34750

Browse files
Merge pull request #196 from technote-space/release/v0.7.1
release/v0.7.1
2 parents 73d3bf7 + 2fe9368 commit 8e34750

File tree

9 files changed

+35
-29
lines changed

9 files changed

+35
-29
lines changed

.github/workflows/check_version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
name: Check package version
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v1
8+
- uses: actions/checkout@v2
99
with:
1010
fetch-depth: 3
1111
- name: Check package version

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
name: ESLint
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v1
16+
- uses: actions/checkout@v2
1717
with:
1818
fetch-depth: 3
1919
- name: Get Yarn Cache Directory
@@ -46,7 +46,7 @@ jobs:
4646
matrix:
4747
node: ['10', '11', '12']
4848
steps:
49-
- uses: actions/checkout@v1
49+
- uses: actions/checkout@v2
5050
with:
5151
fetch-depth: 3
5252
- name: Setup node

.github/workflows/release.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@master
14+
uses: actions/checkout@v2
1515
with:
1616
fetch-depth: 3
17-
- name: Cache node modules
17+
- name: Get Yarn Cache Directory
18+
id: yarn-cache
19+
run: echo "::set-output name=dir::$(yarn cache dir)"
20+
- name: Cache node dependencies
1821
uses: actions/cache@v1
1922
with:
20-
path: ~/.cache/yarn
23+
path: ${{ steps.yarn-cache.outputs.dir }}
2124
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
2225
restore-keys: |
2326
${{ runner.os }}-yarn-
@@ -42,7 +45,7 @@ jobs:
4245
needs: test
4346
steps:
4447
- name: Checkout
45-
uses: actions/checkout@master
48+
uses: actions/checkout@v2
4649
with:
4750
fetch-depth: 3
4851
- name: Setup Node.js
@@ -57,10 +60,13 @@ jobs:
5760
node-version: 12
5861
registry-url: https://npm.pkg.github.com
5962
if: matrix.target == 'gpr'
60-
- name: Cache node modules
63+
- name: Get Yarn Cache Directory
64+
id: yarn-cache
65+
run: echo "::set-output name=dir::$(yarn cache dir)"
66+
- name: Cache node dependencies
6167
uses: actions/cache@v1
6268
with:
63-
path: ~/.cache/yarn
69+
path: ${{ steps.yarn-cache.outputs.dir }}
6470
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
6571
restore-keys: |
6672
${{ runner.os }}-yarn-

.github/workflows/update-dependencies.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ jobs:
1414
uses: technote-space/create-pr-action@v1
1515
with:
1616
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
17-
GLOBAL_INSTALL_PACKAGES: npm-check-updates
1817
EXECUTE_COMMANDS: |
19-
ncu -u --packageFile package.json
18+
npx npm-check-updates -u --packageFile package.json
2019
yarn install
2120
yarn upgrade
2221
yarn audit

__tests__/git-helper.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ describe('GitHelper', () => {
184184
`rm -rdf '${workDir}'`,
185185
'git init \'.\'',
186186
'git remote add origin \'https://octocat:[email protected]/hello/world.git\' > /dev/null 2>&1 || :',
187-
'git fetch origin',
187+
'git fetch origin || :',
188188
]);
189189
});
190190

@@ -197,7 +197,7 @@ describe('GitHelper', () => {
197197
`rm -rdf '${workDir}'`,
198198
'git init \'.\'',
199199
'git remote add origin \'https://octocat:[email protected]/hello/world.git\' > /dev/null 2>&1 || :',
200-
'git fetch --no-tags origin',
200+
'git fetch --no-tags origin || :',
201201
]);
202202
});
203203

@@ -210,7 +210,7 @@ describe('GitHelper', () => {
210210
`rm -rdf '${workDir}'`,
211211
'git init \'.\'',
212212
'git remote add origin \'https://octocat:[email protected]/hello/world.git\' > /dev/null 2>&1 || :',
213-
'git fetch origin \'+refs/pull/*/merge:refs/remotes/pull/*/merge\' \'+refs/heads/hoge:refs/remotes/origin/hoge\'',
213+
'git fetch origin \'+refs/pull/*/merge:refs/remotes/pull/*/merge\' \'+refs/heads/hoge:refs/remotes/origin/hoge\' || :',
214214
]);
215215
});
216216
});

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@technote-space/github-action-helper",
3-
"version": "0.7.0",
3+
"version": "0.7.1",
44
"description": "Helper to filter GitHub Action.",
55
"author": "Technote <[email protected]> (https://technote.space)",
66
"license": "MIT",
@@ -29,8 +29,8 @@
2929
},
3030
"devDependencies": {
3131
"@technote-space/github-action-test-helper": "^0.0.28",
32-
"@types/jest": "^24.0.25",
33-
"@types/node": "^13.1.6",
32+
"@types/jest": "^24.9.0",
33+
"@types/node": "^13.1.7",
3434
"@typescript-eslint/eslint-plugin": "^2.16.0",
3535
"@typescript-eslint/parser": "^2.16.0",
3636
"eslint": "^6.8.0",

src/git-helper.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ export default class GitHelper {
275275
'origin',
276276
...(refspec ?? []),
277277
],
278+
suppressError: true,
278279
stderrToStdout: true,
279280
});
280281
};

src/logger.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const ATTRIBUTE_MAP = {
2020
'italic': 3,
2121
};
2222
type Color = 'black' | 'red' | 'green' | 'yellow' | 'blue' | 'magenta' | 'cyan' | 'white';
23-
type Attribute = undefined | 'none' | 'bold' | 'underline' | 'italic';
23+
type Attribute = 'none' | 'bold' | 'underline' | 'italic';
2424
type Setting = {
2525
color?: Color;
2626
backColor?: Color;

yarn.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -432,10 +432,10 @@
432432
"@types/istanbul-lib-coverage" "*"
433433
"@types/istanbul-lib-report" "*"
434434

435-
"@types/jest@^24.0.25":
436-
version "24.0.25"
437-
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.25.tgz#2aba377824ce040114aa906ad2cac2c85351360f"
438-
integrity sha512-hnP1WpjN4KbGEK4dLayul6lgtys6FPz0UfxMeMQCv0M+sTnzN3ConfiO72jHgLxl119guHgI8gLqDOrRLsyp2g==
435+
"@types/jest@^24.9.0":
436+
version "24.9.0"
437+
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.9.0.tgz#78c6991cd1734cf0d390be24875e310bb0a9fb74"
438+
integrity sha512-dXvuABY9nM1xgsXlOtLQXJKdacxZJd7AtvLsKZ/0b57ruMXDKCOXAC/M75GbllQX6o1pcZ5hAG4JzYy7Z/wM2w==
439439
dependencies:
440440
jest-diff "^24.3.0"
441441

@@ -444,10 +444,10 @@
444444
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
445445
integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
446446

447-
"@types/node@>= 8", "@types/node@^13.1.6":
448-
version "13.1.6"
449-
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.1.6.tgz#076028d0b0400be8105b89a0a55550c86684ffec"
450-
integrity sha512-Jg1F+bmxcpENHP23sVKkNuU3uaxPnsBMW0cLjleiikFKomJQbsn0Cqk2yDvQArqzZN6ABfBkZ0To7pQ8sLdWDg==
447+
"@types/node@>= 8", "@types/node@^13.1.7":
448+
version "13.1.7"
449+
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.1.7.tgz#db51d28b8dfacfe4fb2d0da88f5eb0a2eca00675"
450+
integrity sha512-HU0q9GXazqiKwviVxg9SI/+t/nAsGkvLDkIdxz+ObejG2nX6Si00TeLqHMoS+a/1tjH7a8YpKVQwtgHuMQsldg==
451451

452452
"@types/stack-utils@^1.0.1":
453453
version "1.0.1"
@@ -1193,9 +1193,9 @@ error-ex@^1.3.1:
11931193
is-arrayish "^0.2.1"
11941194

11951195
es-abstract@^1.17.0-next.1:
1196-
version "1.17.0"
1197-
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0.tgz#f42a517d0036a5591dbb2c463591dc8bb50309b1"
1198-
integrity sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==
1196+
version "1.17.2"
1197+
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.2.tgz#965b10af56597b631da15872c17a405e86c1fd46"
1198+
integrity sha512-YoKuru3Lyoy7yVTBSH2j7UxTqe/je3dWAruC0sHvZX1GNd5zX8SSLvQqEgO9b3Ex8IW+goFI9arEEsFIbulhOw==
11991199
dependencies:
12001200
es-to-primitive "^1.2.1"
12011201
function-bind "^1.1.1"

0 commit comments

Comments
 (0)