Skip to content

Commit 9c686f6

Browse files
committed
build: use locally defined npm dependencies in github-actions/
1 parent 0b86139 commit 9c686f6

File tree

5 files changed

+91
-47
lines changed

5 files changed

+91
-47
lines changed

MODULE.bazel

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""Rules/toolchains for devinfra with Bazel."""
2+
23
module(
34
name = "devinfra",
45
)
@@ -26,6 +27,7 @@ git_override(
2627
commit = "155c3367c0140dc3c8ff0d0ee050f5cc6aa0a643",
2728
remote = "https://github.com/devversion/rules_browsers.git",
2829
)
30+
2931
bazel_dep(name = "rules_sass")
3032
git_override(
3133
module_name = "rules_sass",
@@ -43,7 +45,6 @@ git_override(
4345
yq = use_extension("@yq.bzl//yq:extensions.bzl", "yq")
4446
use_repo(yq, "yq_toolchains")
4547

46-
4748
rules_ts_ext = use_extension("@aspect_rules_ts//ts:extensions.bzl", "ext")
4849
rules_ts_ext.deps(
4950
# Obtained by: curl --silent https://registry.npmjs.org/typescript/5.9.2 | jq -r '.dist.integrity'
@@ -67,43 +68,41 @@ node.toolchain(
6768
)
6869
use_repo(node, "nodejs_toolchains")
6970

70-
7171
rules_angular = use_extension("@rules_angular//setup:extensions.bzl", "rules_angular")
7272
rules_angular.setup(
7373
name = "dev_infra_rules_angular_configurable_deps",
7474
angular_compiler_cli = "//:node_modules/@angular/compiler-cli",
7575
typescript = "//:node_modules/typescript-local",
7676
)
77-
use_repo(rules_angular, **{"rules_angular_configurable_deps":"dev_infra_rules_angular_configurable_deps"})
78-
77+
use_repo(rules_angular, **{"rules_angular_configurable_deps": "dev_infra_rules_angular_configurable_deps"})
7978

8079
npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
81-
8280
npm.npm_translate_lock(
83-
name = "devinfra_npm",
84-
data = [
85-
"@devinfra//:package.json",
86-
"@devinfra//bazel:package.json",
87-
"@devinfra//.github/local-actions/branch-manager:package.json",
88-
"@devinfra//.github/local-actions/labels-sync:package.json",
89-
"@devinfra//.github/local-actions/lock-closed:package.json",
90-
"@devinfra//github-actions/google-internal-tests:package.json",
91-
"@devinfra//github-actions/pull-request-labeling:package.json",
92-
"@devinfra//github-actions/unified-status-check:package.json",
93-
"@devinfra//github-actions/previews/pack-and-upload-artifact:package.json",
94-
"@devinfra//github-actions/previews/upload-artifacts-to-firebase:package.json",
95-
"@devinfra//github-actions/post-approval-changes:package.json",
96-
"@devinfra//github-actions/branch-manager:package.json",
97-
"@devinfra//github-actions/saucelabs:package.json",
98-
"@devinfra//github-actions/browserstack:package.json",
99-
"@devinfra//github-actions/bazel/configure-remote:package.json",
100-
"@devinfra//github-actions/org-file-sync:package.json",
101-
"@devinfra//github-actions/feature-request:package.json",
102-
"@devinfra//ng-dev:package.json",
103-
"@devinfra//bazel/spec-bundling/test:package.json",
104-
"@devinfra//:pnpm-workspace.yaml",
105-
],
106-
pnpm_lock = "@devinfra//:pnpm-lock.yaml",
107-
npmrc = "@devinfra//:.npmrc",
81+
name = "devinfra_npm",
82+
data = [
83+
"@devinfra//.github/local-actions/branch-manager:package.json",
84+
"@devinfra//.github/local-actions/labels-sync:package.json",
85+
"@devinfra//.github/local-actions/lock-closed:package.json",
86+
"@devinfra//:package.json",
87+
"@devinfra//:pnpm-workspace.yaml",
88+
"@devinfra//bazel:package.json",
89+
"@devinfra//bazel/spec-bundling/test:package.json",
90+
"@devinfra//github-actions:package.json",
91+
"@devinfra//github-actions/bazel/configure-remote:package.json",
92+
"@devinfra//github-actions/branch-manager:package.json",
93+
"@devinfra//github-actions/browserstack:package.json",
94+
"@devinfra//github-actions/feature-request:package.json",
95+
"@devinfra//github-actions/google-internal-tests:package.json",
96+
"@devinfra//github-actions/org-file-sync:package.json",
97+
"@devinfra//github-actions/post-approval-changes:package.json",
98+
"@devinfra//github-actions/previews/pack-and-upload-artifact:package.json",
99+
"@devinfra//github-actions/previews/upload-artifacts-to-firebase:package.json",
100+
"@devinfra//github-actions/pull-request-labeling:package.json",
101+
"@devinfra//github-actions/saucelabs:package.json",
102+
"@devinfra//github-actions/unified-status-check:package.json",
103+
"@devinfra//ng-dev:package.json",
104+
],
105+
npmrc = "@devinfra//:.npmrc",
106+
pnpm_lock = "@devinfra//:pnpm-lock.yaml",
108107
)
109108
use_repo(npm, "devinfra_npm")

github-actions/BUILD.bazel

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1+
load("@devinfra_npm//:defs.bzl", "npm_link_all_packages")
12
load("//tools:defaults.bzl", "ts_config", "ts_project")
23

34
package(default_visibility = ["//github-actions:__subpackages__"])
45

6+
npm_link_all_packages()
7+
58
ts_config(
69
name = "tsconfig",
710
src = "tsconfig.json",
811
deps = [
9-
"//:node_modules/@types/node",
12+
":node_modules/@types/node",
1013
"//:tsconfig",
1114
],
1215
)
@@ -15,8 +18,8 @@ ts_config(
1518
name = "tsconfig_test",
1619
src = "tsconfig-test.json",
1720
deps = [
21+
":node_modules/@types/jasmine",
1822
":tsconfig",
19-
"//:node_modules/@types/jasmine",
2023
],
2124
)
2225

@@ -31,10 +34,10 @@ ts_project(
3134
"//github-actions:__subpackages__",
3235
],
3336
deps = [
34-
"//:node_modules/@actions/core",
35-
"//:node_modules/@actions/github",
36-
"//:node_modules/@octokit/auth-app",
37-
"//:node_modules/@octokit/rest",
38-
"//:node_modules/@types/node",
37+
":node_modules/@actions/core",
38+
":node_modules/@actions/github",
39+
":node_modules/@octokit/auth-app",
40+
":node_modules/@octokit/rest",
41+
":node_modules/@types/node",
3942
],
4043
)

github-actions/package.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
{
2-
"type": "module"
2+
"type": "module",
3+
"dependencies": {
4+
"@actions/core": "1.11.1",
5+
"@actions/github": "6.0.1",
6+
"@octokit/auth-app": "8.0.2",
7+
"@octokit/rest": "22.0.0",
8+
"@types/jasmine": "5.1.9",
9+
"@types/node": "24.3.0"
10+
}
311
}

pnpm-lock.yaml

Lines changed: 42 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pnpm-workspace.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ packages:
66
- .github/local-actions/branch-manager
77
- .github/local-actions/labels-sync
88
- .github/local-actions/lock-closed
9+
- github-actions
910
- github-actions/google-internal-tests
1011
- github-actions/pull-request-labeling
1112
- github-actions/unified-status-check

0 commit comments

Comments
 (0)