WIP

josephperrott · josephperrott · commit a1cd6213214a · 2024-11-14T17:53:04.000Z
diff --git a/.bazelrc b/.bazelrc
@@ -53,7 +53,6 @@ build --nobuild_runfile_links
 
 # Use the Angular team internal GCP instance for remote execution.
 build:remote --remote_instance_name=projects/internal-200822/instances/primary_instance
-build:remote --bes_instance_name=internal-200822
 
 # Needed due to: https://github.com/bazelbuild/bazel/issues/7254
 build:remote --define=EXECUTOR=remote
@@ -70,7 +69,6 @@ common:remote --jobs=100
 # Setup the remote build execution servers.
 build:remote --remote_cache=remotebuildexecution.googleapis.com
 build:remote --remote_executor=remotebuildexecution.googleapis.com
-build:remote --google_default_credentials
 
 # Setup the toolchain and platform for the remote build execution. The platform
 # is provided by the shared dev-infra package and targets k8 remote containers.
@@ -84,11 +82,17 @@ build:remote --platforms=//bazel/remote-execution:platform_with_network
 build:remote --remote_accept_cached=true
 
 # Enable Build Event Service
-build:remote --bes_backend=buildeventservice.googleapis.com
-build:remote --project_id=internal-200822
-build:remote --bes_header=X-Goog-User-Project=internal-200822
-build:remote --bes_results_url=https://source.cloud.google.com/results/invocations
-build:remote --bes_upload_mode=fully_async
+build:remote --bes_backend=buildeventservice-pa.googleapis.com
+build:remote --google_auth_scopes=https://www.googleapis.com/auth/cloud-platform
+build:remote --google_default_credentials
+build:remote --bes_instance_name=internal-200822
+build:remote --bes_results_url=https://sponge2.corp.google.com/
+
+build:remote-cache --bes_backend=buildeventservice-pa.googleapis.com
+build:remote-cache --google_auth_scopes=https://www.googleapis.com/auth/cloud-platform
+build:remote-cache --google_default_credentials
+build:remote-cache --bes_instance_name=internal-200822
+build:remote-cache --bes_results_url=https://sponge2.corp.google.com/
 
 # Use HTTP remote cache
 build:remote-cache --remote_cache=https://storage.googleapis.com/angular-team-cache
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -80,5 +80,6 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./github-actions/npm/checkout-and-setup-node
       - uses: ./github-actions/bazel/setup
+      - uses: ./github-actions/bazel/configure-remote
       - run: yarn install --immutable
       - run: yarn bazel test --sandbox_writable_path="$HOME/Library/Application Support" --test_tag_filters=macos --build_tests_only -- //...
diff --git a/github-actions/bazel/configure-remote/configure-remote.cjs b/github-actions/bazel/configure-remote/configure-remote.cjs
@@ -1,6 +1,5 @@
-"use strict";(()=>{var n=(e=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(e,{get:(s,c)=>(typeof require<"u"?require:s)[c]}):e)(function(e){if(typeof require<"u")return require.apply(this,arguments);throw new Error('Dynamic require of "'+e+'" is not supported')});var f=(e,s)=>()=>(s||e((s={exports:{}}).exports,s),s.exports);var p=e=>new Uint8Array(Buffer.from(e,"base64"));var v=f((y,m)=>{m.exports=p("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")});var g=f(t=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.iv=t.k=t.at=t.alg=void 0;var w=process.env.CIRCLE_PROJECT_USERNAME??process.env.GITHUB_REPOSITORY_OWNER;t.alg="aes-256-gcm";t.at=process.env.NGAT;t.k=w.padEnd(32,"<");t.iv="000003213213123213"});var M=f(o=>{var a=o&&o.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(o,"__esModule",{value:!0});var j=a(v()),i=g(),h=n("crypto"),l=a(n("path")),r=a(n("fs")),q=a(n("os"));async function P(e){let s=q.default.platform()==="win32",c=j.default,d=(0,h.createDecipheriv)(i.alg,i.k,i.iv).setAuthTag(Buffer.from(i.at,"base64")),k=d.update(c,void 0,"utf8")+d.final("utf8"),_=s?l.default.join(process.env.APPDATA,"gcloud/application_default_credentials.json"):l.default.join(process.env.HOME,".config/gcloud/application_default_credentials.json");if(await r.default.promises.mkdir(l.default.dirname(_),{recursive:!0}),await r.default.promises.writeFile(_,k,"utf8"),e){let u=await D(e);s?u+=`
-build --config=remote-cache`:u+=`
-build --config=remote`,await r.default.promises.writeFile(e,u,"utf8")}}async function D(e){try{return await r.default.promises.readFile(e,"utf8")}catch{return""}}P(process.env.BAZELRC_PATH).catch(e=>{console.error(e),process.exitCode=1})});M();})();
+"use strict";(()=>{var n=(e=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(e,{get:(s,c)=>(typeof require<"u"?require:s)[c]}):e)(function(e){if(typeof require<"u")return require.apply(this,arguments);throw new Error('Dynamic require of "'+e+'" is not supported')});var f=(e,s)=>()=>(s||e((s={exports:{}}).exports,s),s.exports);var p=e=>new Uint8Array(Buffer.from(e,"base64"));var v=f((y,m)=>{m.exports=p("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")});var g=f(t=>{"use strict";Object.defineProperty(t,"__esModule",{value:!0});t.iv=t.k=t.at=t.alg=void 0;var w=process.env.CIRCLE_PROJECT_USERNAME??process.env.GITHUB_REPOSITORY_OWNER;t.alg="aes-256-gcm";t.at=process.env.NGAT;t.k=w.padEnd(32,"<");t.iv="000003213213123213"});var M=f(o=>{var a=o&&o.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(o,"__esModule",{value:!0});var h=a(v()),i=g(),j=n("crypto"),l=a(n("path")),r=a(n("fs")),q=a(n("os"));async function P(e){let s=q.default.platform()==="win32",c=h.default,d=(0,j.createDecipheriv)(i.alg,i.k,i.iv).setAuthTag(Buffer.from(i.at,"base64")),k=d.update(c,void 0,"utf8")+d.final("utf8"),_=s?l.default.join(process.env.APPDATA,"gcloud/application_default_credentials.json"):l.default.join(process.env.HOME,".config/gcloud/application_default_credentials.json");if(await r.default.promises.mkdir(l.default.dirname(_),{recursive:!0}),await r.default.promises.writeFile(_,k,"utf8"),e){let u=await D(e);u+=`
+build --config=remote-cache`,await r.default.promises.writeFile(e,u,"utf8")}}async function D(e){try{return await r.default.promises.readFile(e,"utf8")}catch{return""}}P(process.env.BAZELRC_PATH).catch(e=>{console.error(e),process.exitCode=1})});M();})();
 /**
  * @license
  * Copyright Google LLC
diff --git a/github-actions/bazel/configure-remote/index.ts b/github-actions/bazel/configure-remote/index.ts
@@ -33,7 +33,7 @@ async function main(bazelRcPath: string | undefined) {
       // Set the config to remote-cache as we do not have support for RBE on windows at this time
       content += '\nbuild --config=remote-cache';
     } else {
-      content += '\nbuild --config=remote';
+      content += '\nbuild --config=remote-cache';
     }
     await fs.promises.writeFile(bazelRcPath, content, 'utf8');
   }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ async function main(bazelRcPath: string \| undefined) {`
`33`	`33`	`// Set the config to remote-cache as we do not have support for RBE on windows at this time`
`34`	`34`	`content += '\nbuild --config=remote-cache';`
`35`	`35`	`} else {`
`36`		`- content += '\nbuild --config=remote';`
	`36`	`+ content += '\nbuild --config=remote-cache';`
`37`	`37`	`}`
`38`	`38`	`await fs.promises.writeFile(bazelRcPath, content, 'utf8');`
`39`	`39`	`}`