chore: use bazel-contrib/setup-bazel

.github/workflows/adev-preview-build.yml

@@ -13,9 +13,6 @@ on:
 
 permissions: read-all
 
-env:
-  BAZEL_REPO_CACHE_PATH: '~/.cache/bazel_repo_cache'
-
 jobs:
   adev-build:
     runs-on: ubuntu-latest
@@ -35,6 +32,17 @@ jobs:
           bazelisk-cache: true
           disk-cache: true
           repository-cache: true
+          bazelrc: |
+            # Print all the options that apply to the build.
+            # This helps us diagnose which options override others
+            # (e.g. /etc/bazel.bazelrc vs. tools/bazel.rc)
+            build --announce_rc
+
+            # More details on failures
+            build --verbose_failures=true
+
+            # CI supports colors but Bazel does not detect it.
+            common --color=yes
       - run: yarn install
       - run: yarn build
       - run: chmod 755 build/dist/bin/adev/build/browser

.github/workflows/adev-preview-deploy.yml

@@ -43,3 +43,21 @@ jobs:
           echo "COMMIT_HASH=$COMMIT_HASH" >> $GITHUB_ENV
         working-directory: build/dist/bin/adev/build/browser
       - run: echo $PR_NUMBER $COMMIT_HASH
+      - name: Deploy to cloudflare pages
+        run: npx wrangler publish ./ --project-name $CLOUDFLARE_PAGES_PROJECT --branch pr-$PR_NUMBER --commit-hash $COMMIT_HASH
+        env:
+          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          CLOUDFLARE_PAGES_PROJECT: ${{ var.CLOUDFLARE_PAGES_PROJECT }}
+      - name: Comment on pull request
+        uses: actions/github-script@v4
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const prNumber = process.env.PR_NUMBER;
+            github.issues.createComment({
+              issue_number: ${{ github.event.workflow_run.head_branch }},
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: 'Preview deployed to [Cloudflare Pages](https://pr-${prNumber}.dev-angular-jp.pages.dev)'
+            })
+

.github/workflows/adev-production-deploy.yml

@@ -5,6 +5,9 @@ on:
     branches:
       - main
 
+env:
+  BAZEL_REPO_CACHE_PATH: '~/.cache/bazel_repo_cache'
+
 jobs:
   adev-build:
     runs-on: ubuntu-latest
@@ -16,6 +19,22 @@ jobs:
         with:
           node-version-file: '.node-version'
           cache: yarn
+      - uses: bazel-contrib/[email protected]
+        with:
+          bazelisk-cache: true
+          disk-cache: true
+          repository-cache: true
+          bazelrc: |
+            # Print all the options that apply to the build.
+            # This helps us diagnose which options override others
+            # (e.g. /etc/bazel.bazelrc vs. tools/bazel.rc)
+            build --announce_rc
+
+            # More details on failures
+            build --verbose_failures=true
+
+            # CI supports colors but Bazel does not detect it.
+            common --color=yes
       - run: yarn install
       - run: yarn build
       - name: Deploy to cloudflare pages

.github/workflows/build-and-test.yml

@@ -8,6 +8,9 @@ on: [pull_request]
 permissions:
   contents: read
 
+env:
+  BAZEL_REPO_CACHE_PATH: '~/.cache/bazel_repo_cache'
+
 jobs:
   # test:
   #   runs-on: ubuntu-latest
@@ -31,6 +34,22 @@ jobs:
         with:
           node-version-file: '.node-version'
           cache: yarn
+      - uses: bazel-contrib/[email protected]
+        with:
+          bazelisk-cache: true
+          disk-cache: true
+          repository-cache: true
+          bazelrc: |
+            # Print all the options that apply to the build.
+            # This helps us diagnose which options override others
+            # (e.g. /etc/bazel.bazelrc vs. tools/bazel.rc)
+            build --announce_rc
+
+            # More details on failures
+            build --verbose_failures=true
+
+            # CI supports colors but Bazel does not detect it.
+            common --color=yes
       - run: yarn install
       - run: yarn build
   # build-windows:

tools/build.mjs

@@ -4,7 +4,6 @@ import { chalk, argv } from 'zx';
 import {
   applyPatches,
   buildAdev,
-  setupBazelrc,
   copyLocalizedFiles,
   remove404HTML,
   copyRobots,
@@ -31,7 +30,6 @@ try {
 
 async function setup({ init }) {
   await resetBuildDir({ init });
-  await setupBazelrc();
 }
 
 async function preBuild({ init }) {

tools/lib/common.mjs

@@ -1,7 +1,6 @@
 import { watch } from 'chokidar';
-import { writeFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
-import { $, cd, chalk, glob, os, within } from 'zx';
+import { $, cd, chalk, glob, within } from 'zx';
 import { cpRf, exists, initDir, rename, sed } from './fileutils.mjs';
 
 const rootDir = resolve(__dirname, '../');
@@ -23,31 +22,6 @@ export async function resetBuildDir({ init = false }) {
   }
 }
 
-export async function setupBazelrc() {
-  await within(async () => {
-    const cachePath = process.env.BAZEL_REPO_CACHE_PATH || resolve(os.homedir(), '.cache/bazel_repo_cache');
-    const escapedCachePath = cachePath.replace(/\\/g, '\\\\');
-
-    cd(`${outDir}`);
-    const bazelrcContent = `
-  # Print all the options that apply to the build.
-  # This helps us diagnose which options override others
-  # (e.g. /etc/bazel.bazelrc vs. tools/bazel.rc)
-  build --announce_rc
-
-  # Avoids re-downloading NodeJS/browsers all the time.
-  build --repository_cache=${escapedCachePath}
-
-  # More details on failures
-  build --verbose_failures=true
-
-  # CI supports colors but Bazel does not detect it.
-  common --color=yes
-`;
-    await writeFile('.bazelrc.user', bazelrcContent);
-  });
-}
-
 export async function buildAdev() {
   await within(async () => {
     cd(`${outDir}`);