fix: upgrade @actions/core from 1.10.1 to 1.11.1

Snyk has created this PR to upgrade @actions/core from 1.10.1 to 1.11.1.

See this package in npm:
@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

.github/actions/setup/action.yml

@@ -1,15 +0,0 @@
-name: Setup Node, PNPM, cache, and install dependencies
-description: Sets up job to use the nodejs version in .nvmrc, pnpm, cache, and install dependencies
-
-runs:
-  using: composite
-  steps:
-    - uses: pnpm/action-setup@v3
-      with:
-        version: 9.5.0
-    - uses: actions/setup-node@v4
-      with:
-        node-version-file: ./.nvmrc
-        cache: 'pnpm'
-    - run: pnpm install
-      shell: bash

.github/workflows/ci_cd.yml

@@ -1,91 +1,29 @@
 name: CI/CD
-
-# PRs come in via the GitHub UI that skip pre-commit hooks which bundle the code.  So we have to check that the code is bundled properly here and potentially re-commit if changes are found
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}
-  cancel-in-progress: ${{ github.ref_name == 'master' && false || true}}
-
 on:
   # only on PRs into and merge to default branch
   pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - labeled
     branches:
       - master
   push:
     branches:
       - master
 
-env:
-  BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || github.ref_name }}
-  PR_TRIGGERED: ${{ github.event_name == 'pull_request' && github.event.action != 'labeled' }}
 jobs:
-  setup:
-    # Skip running if labeled event but not rerun, otehrwise its a supported trigger event
-    if: ${{ github.event.label.name == 'rerun' || github.event.action != 'labeled' }}
-    name: Setup
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.BRANCH }}
-      - name: Setup and cache for later jobs
-        uses: ./.github/actions/setup
-      # GHA requires bundled code to be commited so we bundle automatically via pre-commit hook. However, most contributions come in through the GH UI which skips hooks.
-      # So bundle again here just in case, and if changes are found then commit them to ensure we're testing the correct code.
-      # But GHA does not trigger on changes made via the default GH token, so we need to label the PR to re-run CI.
-      # Alternatives could be using a PAT (rotation/security burden), GH App (overkill/maintenance), or something like pre-commit.ci (not convincing). Lets try this first though
-      - name: Check for bundle changes after install
-        # Only run if not a push event since we only trigger this on the default branch and we don't want to make any non-PR changes there
-        if: ${{ github.event_name != 'push' }}
-        id: changes
-        run: |
-          if [[ -n "$(git status --porcelain)" ]]; then
-            echo "CHANGES_FOUND=true" >> $GITHUB_OUTPUT
-          else
-            echo "No changes detected."
-            echo "CHANGES_FOUND=false" >> $GITHUB_OUTPUT
-          fi
-      - name: Commit and push changes if found
-        if: ${{ steps.changes.outputs.CHANGES_FOUND == 'true' }}
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git add .
-          git commit -m "patch: regenerated bundle"
-          git push
-      - name: Label PR to re-trigger CI
-        if: ${{ steps.changes.outputs.CHANGES_FOUND == 'true' }}
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh pr edit ${{ github.event.pull_request.number }} --add-label "rerun"
-      - name: Remove label after clean re-run
-        # Only remove label if the PR was labeled with rerun and no changes were found. Changes found indicate a problem since they should have been previously committed
-        if: ${{ steps.changes.outputs.CHANGES_FOUND == 'false' && github.event.label.name == 'rerun' }}
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh pr edit ${{ github.event.pull_request.number }} --remove-label "rerun"
-
   ci_unit:
     name: Run Unit Tests
     runs-on: ubuntu-latest
-    needs: setup
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup
-        uses: ./.github/actions/setup
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install dependencies
+        run: npm ci
       - name: Run Unit Tests
         run: npm test
-      - uses: codecov/codecov-action@v5
+      - uses: codecov/codecov-action@v3
         with:
           directory: ./coverage/
           verbose: true
@@ -93,12 +31,15 @@ jobs:
   ci_integration:
     name: Run Integration Tests
     runs-on: ubuntu-latest
-    needs: setup
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup
-        uses: ./.github/actions/setup
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install dependencies
+        run: npm ci
 
       - name: happy-path
         id: happy_path
@@ -107,7 +48,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' }}
@@ -126,11 +67,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 }}
@@ -144,15 +85,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 }}
@@ -166,15 +107,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 }}
@@ -188,11 +129,11 @@ 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 }}
@@ -200,12 +141,15 @@ jobs:
   ci_integration_envvar:
     name: Run Integration Env Var Tests
     runs-on: ubuntu-latest
-    needs: setup
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup
-        uses: ./.github/actions/setup
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install dependencies
+        run: npm ci
       - name: env-vars-passed-through
         uses: ./
         env:
@@ -218,12 +162,15 @@ jobs:
   ci_integration_large_output:
     name: Run Integration Large Output Tests
     runs-on: ubuntu-latest
-    needs: setup
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup
-        uses: ./.github/actions/setup
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install dependencies
+        run: npm ci
       - name: Test 100MiB of output can be processed
         id: large-output
         continue-on-error: true
@@ -233,12 +180,12 @@ 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 }}
@@ -246,12 +193,15 @@ jobs:
   ci_integration_retry_on_exit_code:
     name: Run Integration retry_on_exit_code Tests
     runs-on: ubuntu-latest
-    needs: setup
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup
-        uses: ./.github/actions/setup
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install dependencies
+        run: npm ci
       - name: retry_on_exit_code (with expected error code)
         id: retry_on_exit_code_expected
         uses: ./
@@ -261,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 }}
@@ -279,11 +229,11 @@ 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 }}
@@ -291,12 +241,15 @@ jobs:
   ci_integration_continue_on_error:
     name: Run Integration continue_on_error Tests
     runs-on: ubuntu-latest
-    needs: setup
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup
-        uses: ./.github/actions/setup
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install dependencies
+        run: npm ci
       - name: happy-path (continue_on_error)
         id: happy_path_continue_on_error
         uses: ./
@@ -312,22 +265,22 @@ 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 }}
@@ -335,12 +288,15 @@ jobs:
   ci_integration_retry_wait_seconds:
     name: Run Integration Tests (retry_wait_seconds)
     runs-on: ubuntu-latest
-    needs: setup
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup
-        uses: ./.github/actions/setup
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install dependencies
+        run: npm ci
 
       - name: sad-path (retry_wait_seconds)
         id: sad_path_wait_sec
@@ -351,15 +307,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 }}
@@ -368,12 +324,15 @@ jobs:
   ci_integration_on_retry_cmd:
     name: Run Integration Tests (on_retry_command)
     runs-on: ubuntu-latest
-    needs: setup
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup
-        uses: ./.github/actions/setup
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install dependencies
+        run: npm ci
 
       - name: new-command-on-retry
         id: new-command-on-retry
@@ -408,12 +367,15 @@ jobs:
   ci_integration_timeout_seconds:
     name: Run Integration Timeout Tests (seconds)
     runs-on: ubuntu-latest
-    needs: setup
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup
-        uses: ./.github/actions/setup
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install dependencies
+        run: npm ci
 
       - name: sad-path (timeout)
         id: sad_path_timeout
@@ -423,11 +385,11 @@ 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 }}
@@ -435,12 +397,15 @@ jobs:
   ci_integration_timeout_retry_on_timeout:
     name: Run Integration Timeout Tests (retry_on timeout)
     runs-on: ubuntu-latest
-    needs: setup
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup
-        uses: ./.github/actions/setup
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install dependencies
+        run: npm ci
 
       - name: retry_on (timeout)
         id: retry_on_timeout
@@ -451,11 +416,11 @@ 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 }}
@@ -463,12 +428,15 @@ jobs:
   ci_integration_timeout_retry_on_error:
     name: Run Integration Timeout Tests (retry_on error)
     runs-on: ubuntu-latest
-    needs: setup
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup
-        uses: ./.github/actions/setup
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install dependencies
+        run: npm ci
 
       - name: retry_on (error) fails early if timeout encountered
         id: retry_on_error_fail
@@ -479,15 +447,15 @@ 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 }}
@@ -495,12 +463,15 @@ jobs:
   ci_integration_timeout_minutes:
     name: Run Integration Timeout Tests (minutes)
     runs-on: ubuntu-latest
-    needs: setup
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup
-        uses: ./.github/actions/setup
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install dependencies
+        run: npm ci
 
       - name: sad-path (timeout minutes)
         id: sad_path_timeout_minutes
@@ -510,11 +481,11 @@ 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 }}
@@ -522,12 +493,15 @@ jobs:
   ci_windows:
     name: Run Windows Tests
     runs-on: windows-latest
-    needs: setup
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup
-        uses: ./.github/actions/setup
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install dependencies
+        run: npm ci
       - name: Powershell test
         uses: ./
         with:
@@ -598,16 +572,18 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup
-        uses: ./.github/actions/setup
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install dependencies
+        run: npm ci
       - name: Release
         id: semantic
         uses: cycjimmy/semantic-release-action@v4
         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 }}

package.json

@@ -3,36 +3,34 @@
   "version": "0.0.0-managed-by-semantic-release",
   "description": "Retries a GitHub Action step on failure or timeout.",
   "scripts": {
-    "bundle": "ncc build src/index.ts",
     "lint:base": "eslint --config ./.config/.eslintrc.js ",
-    "lint": "pnpm lint:base -- .",
-    "local": "pnpm prepare && node -r dotenv/config ./dist/index.js",
-    "preinstall": "npx only-allow pnpm",
-    "prepare": "pnpm bundle && husky install",
+    "lint": "npm run lint:base -- .",
+    "local": "npm run prepare && node -r dotenv/config ./dist/index.js",
+    "prepare": "ncc build src/index.ts && husky install",
     "style:base": "prettier --config ./.config/.prettierrc.yml --ignore-path ./.config/.prettierignore --write ",
-    "style": "pnpm style:base -- .",
+    "style": "npm run style:base -- .",
     "test": "jest -c ./.config/jest.config.js"
   },
   "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",
+    "@actions/core": "^1.11.1",
     "milliseconds": "^1.0.3",
     "tree-kill": "^1.2.2"
   },
   "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",
@@ -47,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",

src/index.ts

@@ -14,8 +14,6 @@ const OUTPUT_EXIT_ERROR_KEY = 'exit_error';
 let exit: number;
 let done: boolean;
 
-info('test');
-
 function getExecutable(inputs: Inputs): string {
   if (!inputs.shell) {
     return OS === 'win32' ? 'powershell' : 'bash';
@@ -132,7 +130,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);
@@ -159,8 +156,6 @@ async function runAction(inputs: Inputs) {
           info(`Attempt ${attempt} failed. Reason: ${error.message}`);
         }
       }
-    } finally {
-      info(`::endgroup::`);
     }
   }
 }