Skip to content

Commit

Permalink
Merge branch 'main' into renovate/eslint-plugin-jest-28.x
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas-Avery committed Apr 29, 2024
2 parents 0bb6628 + 1b76304 commit 52fa335
Show file tree
Hide file tree
Showing 11 changed files with 72 additions and 72 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Expand Up @@ -33,7 +33,7 @@ jobs:
npm run test
steps:
- name: Checkout repo
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

- name: Setup Node
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-dist.yml
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

- name: Setup Node
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
Expand All @@ -47,7 +47,7 @@ jobs:
fi
# If index.js was different than expected, upload the expected version as an artifact
- uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
if: ${{ failure() && steps.diff.conclusion == 'failure' }}
with:
name: dist
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout repo
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

- name: Set up Node
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qa-run.yml
Expand Up @@ -28,7 +28,7 @@ jobs:
- os: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- name: Run Action
uses: ./
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Expand Up @@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout Branch
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4

- name: Branch check
if: ${{ github.event.inputs.release_type != 'Dry Run' }}
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -25,9 +25,9 @@ To use the action, add a step to your GitHub workflow using the following syntax

- `access_token`

The service account access token for retrieving secrets.
The machine account access token for retrieving secrets.

Use GitHub's [encrypted secrets](https://docs.github.com/en/actions/security-guides/encrypted-secrets) to store and retrieve service account access tokens securely.
Use GitHub's [encrypted secrets](https://docs.github.com/en/actions/security-guides/encrypted-secrets) to store and retrieve machine account access tokens securely.

- `secrets`

Expand Down
2 changes: 1 addition & 1 deletion action.yml
Expand Up @@ -6,7 +6,7 @@ branding:
color: "blue"
inputs:
access_token:
description: "The service account access token for retrieving secrets"
description: "The machine account access token for retrieving secrets"
required: true
secrets:
description: "One or more secret Ids to retrieve and the corresponding GitHub environment variable name to set"
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

118 changes: 59 additions & 59 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -45,8 +45,8 @@
"devDependencies": {
"@types/jest": "29.5.12",
"@types/node": "20.12.7",
"@typescript-eslint/eslint-plugin": "7.4.0",
"@typescript-eslint/parser": "7.4.0",
"@typescript-eslint/eslint-plugin": "7.7.1",
"@typescript-eslint/parser": "7.7.1",
"@vercel/ncc": "0.38.1",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
Expand Down
2 changes: 1 addition & 1 deletion src/main.ts
Expand Up @@ -63,7 +63,7 @@ export async function run(): Promise<void> {
});
} else {
let errorMessage =
"The secrets provided could not be found. Please check the service account has access to the secret UUIDs provided.";
"The secrets provided could not be found. Please check the machine account has access to the secret UUIDs provided.";
if (secretResponse.errorMessage) {
errorMessage = errorMessage + `\n\n` + secretResponse.errorMessage;
}
Expand Down

0 comments on commit 52fa335

Please sign in to comment.