Compare commits

..

1 Commits

Author SHA1 Message Date
snyk-bot
1685c408a7 fix: upgrade @actions/core from 1.9.0 to 1.9.1
Snyk has created this PR to upgrade @actions/core from 1.9.0 to 1.9.1.

See this package in npm:
https://www.npmjs.com/package/@actions/core

See this project in Snyk:
https://app.snyk.io/org/nick-invision/project/b960b937-66a3-4aae-9cb2-321f49c8750b?utm_source=github&utm_medium=referral&page=upgrade-pr
2022-08-30 04:38:12 +00:00
10 changed files with 15973 additions and 28996 deletions

View File

@@ -16,4 +16,4 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.
**Logs**
Enable [debug logging](https://docs.github.com/en/actions/monitoring-and-troubleshooting-workflows/enabling-debug-logging#enabling-step-debug-logging) then attach the [raw logs](https://docs.github.com/en/actions/monitoring-and-troubleshooting-workflows/using-workflow-run-logs#downloading-logs) (specifically the raw output of this action).
Enable [debug logging](https://docs.github.com/en/free-pro-team@latest/actions/managing-workflow-runs/enabling-debug-logging#enabling-step-debug-logging) then attach the [raw logs](https://docs.github.com/en/free-pro-team@latest/actions/managing-workflow-runs/using-workflow-run-logs#downloading-logs) (specifically the raw output of this action).

View File

@@ -1,24 +1,20 @@
name: CI/CD
on:
# only on PRs into and merge to default branch
pull_request:
branches:
- master
push:
branches:
- master
jobs:
# runs on branch pushes only
ci_unit:
name: Run Unit Tests
if: startsWith(github.ref, 'refs/heads')
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v1
with:
node-version: 20
node-version: 16
- name: Install dependencies
run: npm ci
- name: Run Unit Tests
@@ -30,14 +26,15 @@ jobs:
ci_integration:
name: Run Integration Tests
if: startsWith(github.ref, 'refs/heads')
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v1
with:
node-version: 20
node-version: 16
- name: Install dependencies
run: npm ci
@@ -140,14 +137,15 @@ jobs:
ci_integration_envvar:
name: Run Integration Env Var Tests
if: startsWith(github.ref, 'refs/heads')
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v1
with:
node-version: 20
node-version: 16
- name: Install dependencies
run: npm ci
- name: env-vars-passed-through
@@ -161,14 +159,15 @@ jobs:
ci_integration_large_output:
name: Run Integration Large Output Tests
if: startsWith(github.ref, 'refs/heads')
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v1
with:
node-version: 20
node-version: 16
- name: Install dependencies
run: npm ci
- name: Test 100MiB of output can be processed
@@ -192,14 +191,15 @@ jobs:
ci_integration_retry_on_exit_code:
name: Run Integration retry_on_exit_code Tests
if: startsWith(github.ref, 'refs/heads')
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v1
with:
node-version: 20
node-version: 16
- name: Install dependencies
run: npm ci
- name: retry_on_exit_code (with expected error code)
@@ -240,14 +240,15 @@ jobs:
ci_integration_continue_on_error:
name: Run Integration continue_on_error Tests
if: startsWith(github.ref, 'refs/heads')
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v1
with:
node-version: 20
node-version: 16
- name: Install dependencies
run: npm ci
- name: happy-path (continue_on_error)
@@ -287,14 +288,15 @@ jobs:
ci_integration_retry_wait_seconds:
name: Run Integration Tests (retry_wait_seconds)
if: startsWith(github.ref, 'refs/heads')
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v1
with:
node-version: 20
node-version: 16
- name: Install dependencies
run: npm ci
@@ -323,14 +325,15 @@ jobs:
ci_integration_on_retry_cmd:
name: Run Integration Tests (on_retry_command)
if: startsWith(github.ref, 'refs/heads')
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v1
with:
node-version: 20
node-version: 16
- name: Install dependencies
run: npm ci
@@ -366,14 +369,15 @@ jobs:
# timeout tests take longer to run so run in parallel
ci_integration_timeout_seconds:
name: Run Integration Timeout Tests (seconds)
if: startsWith(github.ref, 'refs/heads')
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v1
with:
node-version: 20
node-version: 16
- name: Install dependencies
run: npm ci
@@ -396,14 +400,15 @@ jobs:
ci_integration_timeout_retry_on_timeout:
name: Run Integration Timeout Tests (retry_on timeout)
if: startsWith(github.ref, 'refs/heads')
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v1
with:
node-version: 20
node-version: 16
- name: Install dependencies
run: npm ci
@@ -427,14 +432,15 @@ jobs:
ci_integration_timeout_retry_on_error:
name: Run Integration Timeout Tests (retry_on error)
if: startsWith(github.ref, 'refs/heads')
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v1
with:
node-version: 20
node-version: 16
- name: Install dependencies
run: npm ci
@@ -462,14 +468,15 @@ jobs:
ci_integration_timeout_minutes:
name: Run Integration Timeout Tests (minutes)
if: startsWith(github.ref, 'refs/heads')
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v1
with:
node-version: 20
node-version: 16
- name: Install dependencies
run: npm ci
@@ -492,14 +499,15 @@ jobs:
ci_windows:
name: Run Windows Tests
if: startsWith(github.ref, 'refs/heads')
runs-on: windows-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v1
with:
node-version: 20
node-version: 16
- name: Install dependencies
run: npm ci
- name: Powershell test
@@ -563,7 +571,7 @@ jobs:
steps:
- run: echo "If this is hit, all tests successfully passed"
# runs on merge to default only
# runs on push to master only
cd:
name: Publish Action
needs: [ci_all_tests_passed]
@@ -571,16 +579,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v4
uses: actions/setup-node@v1
with:
node-version: 20
node-version: 16
- name: Install dependencies
run: npm ci
- name: Release
id: semantic
uses: cycjimmy/semantic-release-action@v4
uses: cycjimmy/semantic-release-action@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Tag

2
.nvmrc
View File

@@ -1 +1 @@
v20.11.0
v16.16.0

View File

@@ -30,7 +30,7 @@ Retries an Action step on failure or timeout. This is currently intended to repl
### `shell`
**Optional** Shell to use to execute `command`. Defaults to `powershell` on Windows, `bash` otherwise. Supports bash, python, pwsh, sh, cmd, and powershell per [docs](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell)
**Optional** Shell to use to execute `command`. Defaults to `powershell` on Windows, `bash` otherwise. Supports bash, python, pwsh, sh, cmd, and powershell per [docs](https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#using-a-specific-shell)
### `polling_interval_seconds`
@@ -156,7 +156,7 @@ with:
```yaml
- uses: nick-fields/retry@v2
id: retry
# see https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idcontinue-on-error
# see https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#jobsjob_idcontinue-on-error
continue-on-error: true
with:
timeout_seconds: 15

View File

@@ -50,5 +50,5 @@ outputs:
exit_error:
description: The final error returned by the command
runs:
using: 'node20'
using: 'node12'
main: 'dist/index.js'

28358
dist/index.js vendored

File diff suppressed because one or more lines are too long

16464
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -23,7 +23,7 @@
},
"homepage": "https://github.com/nick-invision/retry#readme",
"dependencies": {
"@actions/core": "^1.10.0",
"@actions/core": "^1.9.1",
"milliseconds": "^1.0.3",
"tree-kill": "^1.2.2"
},
@@ -37,7 +37,7 @@
"@types/node": "^16.11.7",
"@typescript-eslint/eslint-plugin": "^5.32.0",
"@typescript-eslint/parser": "^5.32.0",
"@vercel/ncc": "^0.38.1",
"@zeit/ncc": "^0.20.5",
"dotenv": "8.2.0",
"eslint": "^8.21.0",
"eslint-config-prettier": "^8.5.0",

View File

@@ -20,9 +20,7 @@ function getExecutable(inputs: Inputs): string {
}
let executable: string;
const shellName = inputs.shell.split(' ')[0];
switch (shellName) {
switch (inputs.shell) {
case 'bash':
case 'python':
case 'pwsh': {
@@ -31,7 +29,7 @@ function getExecutable(inputs: Inputs): string {
}
case 'sh': {
if (OS === 'win32') {
throw new Error(`Shell ${shellName} not allowed on OS ${OS}`);
throw new Error(`Shell ${inputs.shell} not allowed on OS ${OS}`);
}
executable = inputs.shell;
break;
@@ -39,14 +37,14 @@ function getExecutable(inputs: Inputs): string {
case 'cmd':
case 'powershell': {
if (OS !== 'win32') {
throw new Error(`Shell ${shellName} not allowed on OS ${OS}`);
throw new Error(`Shell ${inputs.shell} not allowed on OS ${OS}`);
}
executable = shellName + '.exe' + inputs.shell.replace(shellName, '');
executable = inputs.shell + '.exe';
break;
}
default: {
throw new Error(
`Shell ${shellName} not supported. See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell for supported shells`
`Shell ${inputs.shell} not supported. See https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#using-a-specific-shell for supported shells`
);
}
}
@@ -73,7 +71,6 @@ async function runCmd(attempt: number, inputs: Inputs) {
exit = 0;
done = false;
let timeout = false;
debug(`Running command ${inputs.command} on ${OS} using shell ${executable}`);
const child =
@@ -91,21 +88,13 @@ async function runCmd(attempt: number, inputs: Inputs) {
child.on('exit', (code, signal) => {
debug(`Code: ${code}`);
debug(`Signal: ${signal}`);
if (code && code > 0) {
exit = code;
}
// timeouts are killed manually
if (signal === 'SIGTERM') {
return;
}
// On Windows signal is null.
if (timeout) {
return;
}
if (code && code > 0) {
exit = code;
}
done = true;
});
@@ -114,7 +103,6 @@ async function runCmd(attempt: number, inputs: Inputs) {
} while (Date.now() < end_time && !done);
if (!done && child.pid) {
timeout = true;
kill(child.pid);
await retryWait(ms.seconds(inputs.retry_wait_seconds));
throw new Error(`Timeout of ${getTimeout(inputs)}ms hit`);

View File

@@ -3,11 +3,6 @@ import { getHeapStatistics } from 'v8';
import { wait } from './util';
// otherwise, TypeError: Cannot assign to read only property 'performance' of object '[object global]'
Object.defineProperty(global, 'performance', {
writable: true,
});
// mocks the setTimeout function, see https://jestjs.io/docs/timer-mocks
jest.useFakeTimers();
jest.spyOn(global, 'setTimeout');