Skip to content

release/v0.7.1 #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
name: Check package version
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
fetch-depth: 3
- name: Check package version
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: ESLint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
fetch-depth: 3
- name: Get Yarn Cache Directory
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
matrix:
node: ['10', '11', '12']
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
fetch-depth: 3
- name: Setup node
Expand Down
18 changes: 12 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v2
with:
fetch-depth: 3
- name: Cache node modules
- name: Get Yarn Cache Directory
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Cache node dependencies
uses: actions/cache@v1
with:
path: ~/.cache/yarn
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
Expand All @@ -42,7 +45,7 @@ jobs:
needs: test
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v2
with:
fetch-depth: 3
- name: Setup Node.js
Expand All @@ -57,10 +60,13 @@ jobs:
node-version: 12
registry-url: https://npm.pkg.github.com
if: matrix.target == 'gpr'
- name: Cache node modules
- name: Get Yarn Cache Directory
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Cache node dependencies
uses: actions/cache@v1
with:
path: ~/.cache/yarn
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/update-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ jobs:
uses: technote-space/create-pr-action@v1
with:
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
GLOBAL_INSTALL_PACKAGES: npm-check-updates
EXECUTE_COMMANDS: |
ncu -u --packageFile package.json
npx npm-check-updates -u --packageFile package.json
yarn install
yarn upgrade
yarn audit
Expand Down
6 changes: 3 additions & 3 deletions __tests__/git-helper.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ describe('GitHelper', () => {
`rm -rdf '${workDir}'`,
'git init \'.\'',
'git remote add origin \'https://octocat:[email protected]/hello/world.git\' > /dev/null 2>&1 || :',
'git fetch origin',
'git fetch origin || :',
]);
});

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

Expand All @@ -210,7 +210,7 @@ describe('GitHelper', () => {
`rm -rdf '${workDir}'`,
'git init \'.\'',
'git remote add origin \'https://octocat:[email protected]/hello/world.git\' > /dev/null 2>&1 || :',
'git fetch origin \'+refs/pull/*/merge:refs/remotes/pull/*/merge\' \'+refs/heads/hoge:refs/remotes/origin/hoge\'',
'git fetch origin \'+refs/pull/*/merge:refs/remotes/pull/*/merge\' \'+refs/heads/hoge:refs/remotes/origin/hoge\' || :',
]);
});
});
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@technote-space/github-action-helper",
"version": "0.7.0",
"version": "0.7.1",
"description": "Helper to filter GitHub Action.",
"author": "Technote <[email protected]> (https://technote.space)",
"license": "MIT",
Expand Down Expand Up @@ -29,8 +29,8 @@
},
"devDependencies": {
"@technote-space/github-action-test-helper": "^0.0.28",
"@types/jest": "^24.0.25",
"@types/node": "^13.1.6",
"@types/jest": "^24.9.0",
"@types/node": "^13.1.7",
"@typescript-eslint/eslint-plugin": "^2.16.0",
"@typescript-eslint/parser": "^2.16.0",
"eslint": "^6.8.0",
Expand Down
1 change: 1 addition & 0 deletions src/git-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ export default class GitHelper {
'origin',
...(refspec ?? []),
],
suppressError: true,
stderrToStdout: true,
});
};
Expand Down
2 changes: 1 addition & 1 deletion src/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const ATTRIBUTE_MAP = {
'italic': 3,
};
type Color = 'black' | 'red' | 'green' | 'yellow' | 'blue' | 'magenta' | 'cyan' | 'white';
type Attribute = undefined | 'none' | 'bold' | 'underline' | 'italic';
type Attribute = 'none' | 'bold' | 'underline' | 'italic';
type Setting = {
color?: Color;
backColor?: Color;
Expand Down
22 changes: 11 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -432,10 +432,10 @@
"@types/istanbul-lib-coverage" "*"
"@types/istanbul-lib-report" "*"

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

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

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

"@types/stack-utils@^1.0.1":
version "1.0.1"
Expand Down Expand Up @@ -1193,9 +1193,9 @@ error-ex@^1.3.1:
is-arrayish "^0.2.1"

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