Skip to content

Commit

Permalink
Revert "feat!: drop Node 12 & decouple development dependencies (goog…
Browse files Browse the repository at this point in the history
…leapis#1439)"

This reverts commit 61a7143.
  • Loading branch information
leahecole committed Aug 18, 2023
1 parent 59fd85c commit cf596cd
Show file tree
Hide file tree
Showing 54 changed files with 80 additions and 4,339 deletions.
13 changes: 5 additions & 8 deletions .github/sync-repo-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,12 @@ branchProtectionRules:
- "ci/kokoro: System test"
- "ci/kokoro: Browser test"
- docs
- lint-gax
- lint-tools
- test-gax (14)
- test-gax (16)
- test-tools (14)
- test-tools (16)
- lint
- test (12)
- test (14)
- test (16)
- cla/google
- windows-gax
- windows-tools
- windows
- OwlBot Post Processor
permissionRules:
- team: yoshi-admins
Expand Down
49 changes: 4 additions & 45 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ on:
pull_request:
name: ci
jobs:
test-gax:
test:
runs-on: ubuntu-latest
strategy:
matrix:
node: [14, 16]
node: [12, 14, 16]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand All @@ -26,28 +26,7 @@ jobs:
- run: npm test
env:
MOCHA_THROW_DEPRECATION: false
test-tools:
runs-on: ubuntu-latest
strategy:
matrix:
node: [14, 16]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
- run: node --version
# The first installation step ensures that all of our production
# dependencies work on the given Node.js version, this helps us find
# dependencies that don't match our engines field:
- run: cd tools; npm install --engine-strict --no-package-lock
# Clean up the production install, before installing dev/production:
- run: cd tools; rm -rf node_modules
- run: cd tools; npm install
- run: cd tools; npm test
env:
MOCHA_THROW_DEPRECATION: false
windows-gax:
windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -58,18 +37,7 @@ jobs:
- run: npm test
env:
MOCHA_THROW_DEPRECATION: false
windows-tools:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 14
- run: cd tools; npm install
- run: cd tools; npm test
env:
MOCHA_THROW_DEPRECATION: false
lint-gax:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -78,15 +46,6 @@ jobs:
node-version: 14
- run: npm install
- run: npm run lint
lint-tools:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 14
- run: cd tools; npm install
- run: cd tools; npm run lint
docs:
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/common.cfg

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

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

2 changes: 1 addition & 1 deletion .kokoro/continuous/node12/common.cfg

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

24 changes: 0 additions & 24 deletions .kokoro/continuous/node14/common.cfg

This file was deleted.

4 changes: 0 additions & 4 deletions .kokoro/continuous/node14/lint.cfg

This file was deleted.

12 changes: 0 additions & 12 deletions .kokoro/continuous/node14/samples-test.cfg

This file was deleted.

12 changes: 0 additions & 12 deletions .kokoro/continuous/node14/system-test.cfg

This file was deleted.

Empty file removed .kokoro/continuous/node14/test.cfg
Empty file.
2 changes: 1 addition & 1 deletion .kokoro/presubmit/node12/browser-test.cfg

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

2 changes: 1 addition & 1 deletion .kokoro/presubmit/node12/common.cfg

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

32 changes: 0 additions & 32 deletions .kokoro/publish-single.sh

This file was deleted.

35 changes: 20 additions & 15 deletions .kokoro/publish.sh

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

2 changes: 1 addition & 1 deletion .kokoro/release/docs.cfg

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

2 changes: 1 addition & 1 deletion .kokoro/release/publish.cfg

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

2 changes: 1 addition & 1 deletion .kokoro/samples-test.sh

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

2 changes: 1 addition & 1 deletion .kokoro/system-test.sh

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

2 changes: 1 addition & 1 deletion .kokoro/test.bat

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

2 changes: 1 addition & 1 deletion .kokoro/test.sh

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

2 changes: 1 addition & 1 deletion owlbot.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

import synthtool.languages.node as node

node.owlbot_main(templates_excludes=["LICENSE", "README.md", ".github/sync-repo-settings.yaml", ".github/workflows/ci.yaml",".kokoro/", ".kokoro/continuous/node12/common.cfg", ".kokoro/presubmit/node12/common.cfg", ".kokoro/release/docs.cfg", ".kokoro/release/publish.cfg"])
node.owlbot_main(templates_excludes=["LICENSE", "README.md", ".github/sync-repo-settings.yaml"])
Loading

0 comments on commit cf596cd

Please sign in to comment.