Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot[bot]
407e071408 build(deps): bump json5 from 2.2.1 to 2.2.3
Bumps [json5](https://github.com/json5/json5) from 2.2.1 to 2.2.3.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v2.2.1...v2.2.3)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-09 02:31:57 +00:00
9 changed files with 17860 additions and 31597 deletions

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
@@ -48,7 +45,7 @@ jobs:
timeout_minutes: 1
max_attempts: 2
command: npm -v
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: true
actual: ${{ steps.happy_path.outputs.total_attempts == '1' && steps.happy_path.outputs.exit_code == '0' }}
@@ -67,11 +64,11 @@ jobs:
timeout_minutes: 1
max_attempts: 2
command: node -e "process.exit(1)"
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: 2
actual: ${{ steps.sad_path_error.outputs.total_attempts }}
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: failure
actual: ${{ steps.sad_path_error.outcome }}
@@ -85,15 +82,15 @@ jobs:
max_attempts: 3
retry_on: timeout
command: node -e "process.exit(2)"
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: 1
actual: ${{ steps.retry_on_timeout_fail.outputs.total_attempts }}
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: failure
actual: ${{ steps.retry_on_timeout_fail.outcome }}
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: 2
actual: ${{ steps.retry_on_timeout_fail.outputs.exit_code }}
@@ -107,15 +104,15 @@ jobs:
max_attempts: 2
retry_on: error
command: node -e "process.exit(2)"
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: 2
actual: ${{ steps.retry_on_error.outputs.total_attempts }}
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: failure
actual: ${{ steps.retry_on_error.outcome }}
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: 2
actual: ${{ steps.retry_on_error.outputs.exit_code }}
@@ -129,25 +126,26 @@ jobs:
max_attempts: 2
shell: cmd
command: 'dir'
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: 2
actual: ${{ steps.wrong_shell.outputs.total_attempts }}
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: failure
actual: ${{ steps.wrong_shell.outcome }}
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
@@ -180,26 +179,27 @@ jobs:
timeout_minutes: 5
command: 'make -C ./test-data/large-output bytes-102400'
- name: Assert test had expected result
uses: nick-fields/assert-action@v2
uses: nick-invision/assert-action@v1
with:
expected: failure
actual: ${{ steps.large-output.outcome }}
- name: Assert exit code is expected
uses: nick-fields/assert-action@v2
uses: nick-invision/assert-action@v1
with:
expected: 2
actual: ${{ steps.large-output.outputs.exit_code }}
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)
@@ -211,11 +211,11 @@ jobs:
retry_on_exit_code: 2
max_attempts: 3
command: node -e "process.exit(2)"
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: failure
actual: ${{ steps.retry_on_exit_code_expected.outcome }}
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: 3
actual: ${{ steps.retry_on_exit_code_expected.outputs.total_attempts }}
@@ -229,25 +229,26 @@ jobs:
retry_on_exit_code: 2
max_attempts: 3
command: node -e "process.exit(1)"
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: failure
actual: ${{ steps.retry_on_exit_code_unexpected.outcome }}
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: 1
actual: ${{ steps.retry_on_exit_code_unexpected.outputs.total_attempts }}
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)
@@ -265,36 +266,37 @@ jobs:
timeout_minutes: 1
continue_on_error: true
- name: Verify continue_on_error returns correct exit code on success
uses: nick-fields/assert-action@v2
uses: nick-invision/assert-action@v1
with:
expected: 0
actual: ${{ steps.happy_path_continue_on_error.outputs.exit_code }}
- name: Verify continue_on_error exits with correct outcome on success
uses: nick-fields/assert-action@v2
uses: nick-invision/assert-action@v1
with:
expected: success
actual: ${{ steps.happy_path_continue_on_error.outcome }}
- name: Verify continue_on_error returns correct exit code on error
uses: nick-fields/assert-action@v2
uses: nick-invision/assert-action@v1
with:
expected: 33
actual: ${{ steps.sad_path_continue_on_error.outputs.exit_code }}
- name: Verify continue_on_error exits with successful outcome when an error occurs
uses: nick-fields/assert-action@v2
uses: nick-invision/assert-action@v1
with:
expected: success
actual: ${{ steps.sad_path_continue_on_error.outcome }}
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
@@ -307,15 +309,15 @@ jobs:
max_attempts: 3
retry_wait_seconds: 15
command: npm install this-isnt-a-real-package-name-zzz
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: 3
actual: ${{ steps.sad_path_wait_sec.outputs.total_attempts }}
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: failure
actual: ${{ steps.sad_path_wait_sec.outcome }}
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: 'Final attempt failed'
actual: ${{ steps.sad_path_wait_sec.outputs.exit_error }}
@@ -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
@@ -385,25 +389,26 @@ jobs:
timeout_seconds: 15
max_attempts: 2
command: node -e "(async()=>await new Promise(r => setTimeout(r, 120000)))()"
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: 2
actual: ${{ steps.sad_path_timeout.outputs.total_attempts }}
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: failure
actual: ${{ steps.sad_path_timeout.outcome }}
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
@@ -416,25 +421,26 @@ jobs:
max_attempts: 2
retry_on: timeout
command: node -e "(async()=>await new Promise(r => setTimeout(r, 120000)))()"
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: 2
actual: ${{ steps.retry_on_timeout.outputs.total_attempts }}
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: failure
actual: ${{ steps.retry_on_timeout.outcome }}
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
@@ -447,29 +453,30 @@ jobs:
max_attempts: 2
retry_on: error
command: node -e "(async()=>await new Promise(r => setTimeout(r, 120000)))()"
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: 1
actual: ${{ steps.retry_on_error_fail.outputs.total_attempts }}
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: failure
actual: ${{ steps.retry_on_error_fail.outcome }}
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: 1
actual: ${{ steps.retry_on_error_fail.outputs.exit_code }}
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
@@ -481,25 +488,26 @@ jobs:
timeout_minutes: 1
max_attempts: 2
command: node -e "(async()=>await new Promise(r => setTimeout(r, 120000)))()"
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: 2
actual: ${{ steps.sad_path_timeout_minutes.outputs.total_attempts }}
- uses: nick-fields/assert-action@v2
- uses: nick-invision/assert-action@v1
with:
expected: failure
actual: ${{ steps.sad_path_timeout_minutes.outcome }}
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,21 +579,19 @@ 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
# only bump v# (e.g., v3) tag if semantic release action publishes any new version
if: ${{ steps.semantic.outputs.new_release_major_version != '' }}
run: git tag -f v${MAJOR_VERSION} && git push -f origin v${MAJOR_VERSION}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

2
.nvmrc
View File

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

View File

@@ -79,7 +79,7 @@ The final error returned by the command
### Shell
```yaml
uses: nick-fields/retry@v3
uses: nick-fields/retry@v2
with:
timeout_minutes: 10
max_attempts: 3
@@ -90,7 +90,7 @@ with:
### Timeout in minutes
```yaml
uses: nick-fields/retry@v3
uses: nick-fields/retry@v2
with:
timeout_minutes: 10
max_attempts: 3
@@ -100,7 +100,7 @@ with:
### Timeout in seconds
```yaml
uses: nick-fields/retry@v3
uses: nick-fields/retry@v2
with:
timeout_seconds: 15
max_attempts: 3
@@ -110,7 +110,7 @@ with:
### Only retry after timeout
```yaml
uses: nick-fields/retry@v3
uses: nick-fields/retry@v2
with:
timeout_seconds: 15
max_attempts: 3
@@ -121,7 +121,7 @@ with:
### Only retry after error
```yaml
uses: nick-fields/retry@v3
uses: nick-fields/retry@v2
with:
timeout_seconds: 15
max_attempts: 3
@@ -132,7 +132,7 @@ with:
### Retry using continue_on_error input (in composite action) but allow failure and do something with output
```yaml
- uses: nick-fields/retry@v3
- uses: nick-fields/retry@v2
id: retry
with:
timeout_seconds: 15
@@ -154,7 +154,7 @@ with:
### Retry using continue-on-error built-in command (in workflow action) but allow failure and do something with output
```yaml
- uses: nick-fields/retry@v3
- 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
continue-on-error: true
@@ -183,7 +183,7 @@ with:
### Run script after failure but before retry
```yaml
uses: nick-fields/retry@v3
uses: nick-fields/retry@v2
with:
timeout_seconds: 15
max_attempts: 3
@@ -194,7 +194,7 @@ with:
### Run different command after first failure
```yaml
uses: nick-fields/retry@v3
uses: nick-fields/retry@v2
with:
timeout_seconds: 15
max_attempts: 3
@@ -206,7 +206,7 @@ with:
```yaml
name: Multi-line multi-command Test
uses: nick-fields/retry@v3
uses: ./
with:
timeout_minutes: 1
max_attempts: 2
@@ -219,7 +219,7 @@ with:
```yaml
name: Multi-line single-command Test
uses: nick-fields/retry@v3
uses: ./
with:
timeout_minutes: 1
max_attempts: 2

View File

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

28702
dist/index.js vendored

File diff suppressed because one or more lines are too long

20521
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -13,15 +13,15 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/nick-fields/retry.git"
"url": "git+https://github.com/nick-invision/retry.git"
},
"keywords": [],
"author": "Nick Fields",
"license": "ISC",
"bugs": {
"url": "https://github.com/nick-fields/retry/issues"
"url": "https://github.com/nick-invision/retry/issues"
},
"homepage": "https://github.com/nick-fields/retry#readme",
"homepage": "https://github.com/nick-invision/retry#readme",
"dependencies": {
"@actions/core": "^1.10.0",
"milliseconds": "^1.0.3",
@@ -30,14 +30,14 @@
"devDependencies": {
"@commitlint/cli": "^16.2.3",
"@commitlint/config-conventional": "^16.2.1",
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/changelog": "^6.0.1",
"@semantic-release/git": "^10.0.1",
"@types/jest": "^28.1.6",
"@types/milliseconds": "0.0.30",
"@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",
@@ -45,7 +45,7 @@
"jest": "^28.1.3",
"lint-staged": "^13.0.3",
"prettier": "^2.7.1",
"semantic-release": "^24.2.3",
"semantic-release": "19.0.3",
"ts-jest": "^28.0.7",
"ts-node": "9.0.0",
"typescript": "^4.7.4",

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/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell for supported shells`
);
}
}
@@ -130,7 +128,6 @@ async function runAction(inputs: Inputs) {
await validateInputs(inputs);
for (let attempt = 1; attempt <= inputs.max_attempts; attempt++) {
info(`::group::Attempt ${attempt}`);
try {
// just keep overwriting attempts output
setOutput(OUTPUT_TOTAL_ATTEMPTS_KEY, attempt);
@@ -157,8 +154,6 @@ async function runAction(inputs: Inputs) {
info(`Attempt ${attempt} failed. Reason: ${error.message}`);
}
}
} finally {
info(`::endgroup::`);
}
}
}

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');