Skip to content

Commit

Permalink
Merge branch 'master' into add-conditional-npmrc-rule
Browse files Browse the repository at this point in the history
  • Loading branch information
samchungy authored Oct 27, 2023
2 parents 610c34d + e72d010 commit e479587
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
fetch-depth: 0
token: ${{ secrets.SEEK_OSS_CI_GITHUB_TOKEN }}

- name: Set up Node.js 18.x
- name: Set up Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20.x

- name: Install dependencies
run: yarn install --frozen-lockfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
fetch-depth: 0
token: ${{ secrets.SEEK_OSS_CI_GITHUB_TOKEN }}

- name: Set up Node.js 18.x
- name: Set up Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20.x

- name: Install dependencies
run: yarn install --frozen-lockfile
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ jobs:
git config user.name seek-oss-ci
git config user.email [email protected]
- name: Set up Node.js 18.x
- name: Set up Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20.x

- name: Install dependencies
run: yarn install --frozen-lockfile
Expand Down Expand Up @@ -85,10 +85,10 @@ jobs:
- name: Check out repo
uses: actions/checkout@v4

- name: Set up Node.js 18.x
- name: Set up Node.js 20.x
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: 20.x

- if: github.head_ref != 'beta' && github.head_ref != 'changeset-release/master' && github.ref_name != 'beta' && github.ref_name != 'changeset-release/master'
name: Test template
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
20
2 changes: 2 additions & 0 deletions src/cli/format.int.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ beforeEach(() => {
});

afterAll(() => {
process.exitCode = undefined;

// Restore the original working directory to avoid confusion in other tests.
process.chdir(originalCwd);

Expand Down
2 changes: 2 additions & 0 deletions src/cli/lint.int.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ beforeEach(() => {
});

afterAll(() => {
process.exitCode = undefined;

// Restore the original working directory to avoid confusion in other tests.
process.chdir(originalCwd);

Expand Down
2 changes: 1 addition & 1 deletion src/wrapper/main.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ test('syncFunctionHandler', async () => {
{ stack: expect.any(String) },
`
{
"message": "Unexpected token I in JSON at position 0",
"message": "Unexpected token 'I', "Invalid JSON" is not valid JSON",
"name": "SyntaxError",
"stack": Any<String>,
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ describe('validateJson', () => {
expect(() =>
validateJson(input, IdDescriptionSchema),
).toThrowErrorMatchingInlineSnapshot(
`"Unexpected token } in JSON at position 0"`,
`"Unexpected token '}', "}" is not valid JSON"`,
);
});
});

0 comments on commit e479587

Please sign in to comment.