Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f39ffd9
chore(gapic-generator-typescript): remove bazel dependency from build
GautamSharda Apr 6, 2026
24c6dc3
chore(gapic-generator-typescript): remove bazel dependency from build
GautamSharda Apr 6, 2026
df8f12f
Merge branch 'bazel' of https://github.com/googleapis/google-cloud-no…
GautamSharda Apr 6, 2026
1f7b615
chore: resolve merge conflicts with main
GautamSharda Apr 6, 2026
c121a9e
Merge branch 'main' into bazel
GautamSharda Apr 6, 2026
d3c679a
ci: fix generator tests after bazel removal
GautamSharda Apr 6, 2026
2daccb9
Merge branch 'bazel' of https://github.com/googleapis/google-cloud-no…
GautamSharda Apr 6, 2026
8ef6196
test: fix permission denied error in generator baselines
GautamSharda Apr 7, 2026
32a2130
fix: ensure templates are copied to build dir during compilation
GautamSharda Apr 7, 2026
f0eefc4
fix: rely on system protoc in CI
GautamSharda Apr 7, 2026
ebb1a64
ci: install protoc before running generator tests
GautamSharda Apr 7, 2026
db1eeff
test: provide PROTOC_PATH in CI
GautamSharda Apr 7, 2026
5da5416
fix: ensure protoc-plugin is executed with node
GautamSharda Apr 7, 2026
7e0eac9
ci: execute error conformance plugin with node
GautamSharda Apr 7, 2026
98d0c01
fix: ensure protoc-plugin is executable for protoc
GautamSharda Apr 7, 2026
ff718a1
fix: enable --experimental_editions in protoc
GautamSharda Apr 7, 2026
8027ef8
ci: revert gapic-error-conformance plugin execution
GautamSharda Apr 8, 2026
dd4bbb2
Merge branch 'main' into bazel
GautamSharda Apr 8, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions .github/workflows/generator-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,37 +37,41 @@ jobs:
with:
node-version: 18.x

- name: Install protoc
run: |
curl -LO "https://github.com/protocolbuffers/protobuf/releases/download/v25.3/protoc-25.3-linux-x86_64.zip"
unzip protoc-25.3-linux-x86_64.zip -d /usr/local
chmod +x /usr/local/bin/protoc

- name: Install Node dependencies with npm
run: npm install
working-directory: core/generator/gapic-generator-typescript

- name: Strip local GCC 15 flags for CI
working-directory: core/generator/gapic-generator-typescript
run: sed -i '/--gsframe/d' .bazelrc

- name: Run bazel build
- name: Run compile
working-directory: core/generator/gapic-generator-typescript
run: bazelisk build --noremote_accept_cached '//...'
run: npm run compile

- name: Run bazel test
- name: Run test
working-directory: core/generator/gapic-generator-typescript
run: bazelisk test --test_output=errors --noremote_accept_cached //...
run: npm test
env:
PROTOC_PATH: /usr/local/bin/protoc

- name: Verify error conformance
working-directory: core/generator/gapic-generator-typescript
run: |
curl -sSL https://github.com/googleapis/gapic-config-validator/releases/download/v0.6.0/gapic-config-validator-0.6.0-linux-amd64.tar.gz > config-validator.tar.gz
tar xzf config-validator.tar.gz --no-same-owner
chmod +x gapic-error-conformance
chmod +x bazel-bin/protoc_plugin_/protoc_plugin
./gapic-error-conformance -plugin="bazel-bin/protoc_plugin_/protoc_plugin"
chmod +x build/typescript/src/protoc-plugin.js
./gapic-error-conformance -plugin="build/typescript/src/protoc-plugin.js"

- name: Prepare baseline artifacts
working-directory: core/generator/gapic-generator-typescript
run: |
mkdir -p ~/artifacts
cp bazel-testlogs/unit_tests/test.outputs/outputs.zip ~/artifacts/
bazelisk run -- @pnpm//:pnpm --dir $PWD install
zip -r ~/artifacts/outputs.zip .test-out-*
npm install
tar cfz ~/artifacts/node_modules.tar.gz node_modules

- name: Save artifacts
Expand All @@ -93,7 +97,6 @@ jobs:
npm run docs
cd ../..
done

- name: Test generated ESM libraries
working-directory: core/generator/gapic-generator-typescript
run: |
Expand Down
2 changes: 0 additions & 2 deletions core/generator/gapic-generator-typescript/.bazeliskrc

This file was deleted.

34 changes: 0 additions & 34 deletions core/generator/gapic-generator-typescript/.bazelrc

This file was deleted.

6 changes: 0 additions & 6 deletions core/generator/gapic-generator-typescript/MODULE.bazel

This file was deleted.

110 changes: 0 additions & 110 deletions core/generator/gapic-generator-typescript/MODULE.bazel.lock

This file was deleted.

60 changes: 0 additions & 60 deletions core/generator/gapic-generator-typescript/WORKSPACE

This file was deleted.

11 changes: 0 additions & 11 deletions core/generator/gapic-generator-typescript/package-lock.json

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

19 changes: 9 additions & 10 deletions core/generator/gapic-generator-typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,25 @@
"build/templates"
],
"scripts": {
"baseline": "node bazel-bin/typescript/tools/update-baselines.js",
"clean": "bazelisk clean && rm -rf build",
"codecov": "c8 --reporter=lcov mocha bazel-bin/typescript/test/unit && c8 report",
"compile": "bazelisk build //...",
"baseline": "node build/typescript/tools/update-baselines.js",
"clean": "rm -rf build",
"codecov": "c8 --reporter=lcov mocha build/typescript/test/unit && c8 report",
"compile": "tsc -p . && cp -r templates build/",
"compile-protos-json": "pbjs -t json -o protos/protos.json -p node_modules/google-gax/build/protos -p protos google/api/annotations.proto google/api/field_behavior.proto google/api/field_info.proto google/api/resource.proto google/api/routing.proto google/longrunning/operations.proto google/protobuf/compiler/plugin.proto service_config.proto snippet_index.proto",
"compile-protos-js": "pbjs -t static-module -o protos/index.js -p node_modules/google-gax/build/protos -p protos google/api/annotations.proto google/api/field_behavior.proto google/api/field_info.proto google/api/resource.proto google/api/routing.proto google/longrunning/operations.proto google/protobuf/compiler/plugin.proto service_config.proto snippet_index.proto",
"compile-protos-dts": "pbts protos/index.js -o protos/index.d.ts",
"docker-test": "sh docker/test.sh",
"fix": "gts fix",
"js-test-application": "mocha bazel-bin/typescript/test/test-application/test-js --timeout 600000",
"js-test-application": "mocha build/typescript/test/test-application/test-js --timeout 600000",
"lint": "gts check",
"prepack:cjs": "npm run compile && cd templates/cjs/typescript_gapic && rm -f package.json.njk && mv package.json package.json.njk && cd ../../.. && mkdir -p build && cp -rf bazel-bin/typescript templates protos build/",
"prepack:esm": "npm run compile && cd templates/esm/typescript_gapic && rm -f package.json.njk && mv package.json package.json.njk && cd ../../.. && mkdir -p build && cp -rf bazel-bin/typescript templates protos build/",
"prepack:cjs": "npm run compile && cd templates/cjs/typescript_gapic && rm -f package.json.njk && mv package.json package.json.njk && cd ../../.. && mkdir -p build && cp -rf build/typescript templates protos build/",
"prepack:esm": "npm run compile && cd templates/esm/typescript_gapic && rm -f package.json.njk && mv package.json package.json.njk && cd ../../.. && mkdir -p build && cp -rf build/typescript templates protos build/",
"prepack": "npm run prepack:cjs && npm run prepack:esm",
"postpack:cjs": "cd templates/cjs/typescript_gapic && mv package.json.njk package.json && ln -s package.json package.json.njk",
"postpack:esm": "cd templates/esm/typescript_gapic && mv package.json.njk package.json && ln -s package.json package.json.njk",
"postpack": "npm run postpack:cjs && npm run postpack:esm",
"test": "bazelisk test --test_output=errors //:unit_tests",
"ts-test-application": "mocha bazel-bin/typescript/test/test-application/test-ts --timeout 600000",
"test": "mocha build/typescript/test/unit --timeout 600000",
"ts-test-application": "mocha build/typescript/test/test-application/test-ts --timeout 600000",
"system-test": "echo 'no system test'",
"samples-test": "echo 'no samples test'",
"docs": "echo no docs needed",
Expand All @@ -61,7 +61,6 @@
"yargs": "^17.7.2"
},
"devDependencies": {
"@bazel/bazelisk": "^1.26.0",
"@types/mocha": "^10.0.10",
"@types/module-alias": "^2.0.4",
"@types/node": "^22.18.12",
Expand Down
Loading
Loading