Skip to content

Commit

Permalink
Merge pull request #135 from dmvict/workflows
Browse files Browse the repository at this point in the history
READY: Synchronize workflows with `js_action` branch, remove extra steps
  • Loading branch information
dmvict authored Mar 4, 2024
2 parents 0ef67d3 + c1a72e5 commit be8b50a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 37 deletions.
14 changes: 1 addition & 13 deletions .github/workflows/JsActionPublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,11 @@ jobs :
- name : ${{ matrix.node-version }}
uses : Wandalen/wretry.action@master
with :
action : actions/setup-node@v2
action : actions/setup-node@v4
with : |
node-version : ${{ matrix.node-version }}
attempt_limit : 3
attempt_delay: 1000
- name : Save npm version
id : getnpmver
run : |
echo "npmver=$(npm -v)" >> $GITHUB_OUTPUT
- name : Update npm if current version is 6
if : "startsWith( steps.getnpmver.outputs.npmver, '6.' )"
run : npm install -g npm@latest-6
- name : Update node-gyp
if: ${{ matrix.os == 'windows-latest' && matrix.node-version != '18.x' }}
run : |
npm install --global [email protected]
npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"}
- name : Install willbe
uses : Wandalen/wretry.action@master
with :
Expand Down
12 changes: 1 addition & 11 deletions .github/workflows/JsActionPullRequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,11 @@ jobs :
- name : ${{ matrix.node-version }}
uses : Wandalen/wretry.action@master
with :
action : actions/setup-node@v2
action : actions/setup-node@v4
with : |
node-version : ${{ matrix.node-version }}
attempt_limit : 3
attempt_delay: 1000
- name : Update npm
if : ${{ matrix.os == 'windows-latest' && matrix.node-version > '14.x' }}
run : |
npm install --global --production npm-windows-upgrade
npm-windows-upgrade --npm-version latest
- name : Update node-gyp
if: ${{ matrix.os == 'windows-latest' && matrix.node-version != '18.x' }}
run : |
npm install --global [email protected]
npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"}
- name : Install willbe
uses : Wandalen/wretry.action@master
with :
Expand Down
14 changes: 1 addition & 13 deletions .github/workflows/JsActionPush.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,11 @@ jobs :
- name : ${{ matrix.node-version }}
uses : Wandalen/wretry.action@master
with :
action : actions/setup-node@v2
action : actions/setup-node@v4
with : |
node-version : ${{ matrix.node-version }}
attempt_limit : 3
attempt_delay: 1000
- name : Save npm version
id : getnpmver
run : |
echo "npmver=$(npm -v)" >> $GITHUB_OUTPUT
- name : Update npm if current version is 6
if : "startsWith( steps.getnpmver.outputs.npmver, '6.' )"
run : npm install -g npm@latest-6
- name : Update node-gyp
if: ${{ matrix.os == 'windows-latest' && matrix.node-version != '18.x' }}
run : |
npm install --global [email protected]
npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"}
- name : Install willbe
uses : Wandalen/wretry.action@master
with :
Expand Down

0 comments on commit be8b50a

Please sign in to comment.