Skip to content

Commit

Permalink
Merge branch 'main' into flat_config_migration
Browse files Browse the repository at this point in the history
  • Loading branch information
tonycoco authored Oct 10, 2024
2 parents ac25648 + 9b37243 commit 6210d1c
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [14, 16, 18, 20, 21]
node: [18, 20, 22]
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/setup-node@v4
Expand All @@ -29,7 +29,7 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/setup-node@v4
with:
node-version: 20
node-version: 18
- run: npm ci
- run: npm run system-test
system_test:
Expand All @@ -38,7 +38,7 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/setup-node@v4
with:
node-version: 20
node-version: 18
- run: npm ci
- run: npm run system-test
lint:
Expand All @@ -47,7 +47,7 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/setup-node@v4
with:
node-version: 20
node-version: 18
- run: npm ci
- run: npm run lint
license_check:
Expand All @@ -56,6 +56,6 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/setup-node@v4
with:
node-version: 20
node-version: 18
- run: npm ci
- run: npm run license-check
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/setup-node@v4
with:
node-version: 20
node-version: 18
registry-url: 'https://wombat-dressing-room.appspot.com'
- run: npm ci
- run: npm publish
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"fix": "eslint --fix '**/*.ts'"
},
"engines": {
"node": ">=14"
"node": ">=18"
},
"keywords": ["typescript", "linter", "formatter", "google"],
"author": "Google Inc.",
Expand Down
4 changes: 3 additions & 1 deletion test/kitchen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ const execOpts = {
encoding: 'utf8' as BufferEncoding,
};

describe('🚰 kitchen sink', () => {
const action = process.platform !== 'win32' ? describe : describe.skip;

action('🚰 kitchen sink', () => {
const fixturesPath = path.join('test', 'fixtures');
const gtsPath = path.join('node_modules', '.bin', 'gts');
const kitchenPath = path.join(stagingPath, 'kitchen');
Expand Down
5 changes: 2 additions & 3 deletions tsconfig-google.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@
"noImplicitReturns": true,
"pretty": true,
"sourceMap": true,
"stripInternal": true,
"strict": true,
"target": "es2018"
},
"exclude": [
"node_modules"
]
"exclude": ["node_modules"]
}

0 comments on commit 6210d1c

Please sign in to comment.