From c9881949db30fb90ff7c9ad45f69015a9d475a55 Mon Sep 17 00:00:00 2001
From: Felix Hanau <felix@cloudflare.com>
Date: Mon, 27 May 2024 13:33:08 -0400
Subject: [PATCH] [CI] Have npm-types build job mirror release build job

This should fix type generation, the Ubuntu 24.04 image appears to be
lacking libc++ (?). Note that this is not a complete revert of the
previous commit, version jobs continue to use 24.04 as they appear to
work with 24.04 without issue. Mirroring the build configuration there
too would add additional maintenance overhead.
---
 .github/workflows/npm-types.yml | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/npm-types.yml b/.github/workflows/npm-types.yml
index 635bc36a067..32696d774e5 100644
--- a/.github/workflows/npm-types.yml
+++ b/.github/workflows/npm-types.yml
@@ -22,31 +22,40 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
+        with:
+          show-progress: false
       - id: echo
         run: |
           echo "date=$(cat src/workerd/io/supported-compatibility-date.txt)" >> $GITHUB_OUTPUT;
           echo "version=${{ inputs.prerelease == false && '4' || '0'}}.$(cat src/workerd/io/supported-compatibility-date.txt | tr -d '-').${{ inputs.patch }}" >> $GITHUB_OUTPUT;
           echo "release_version=1.$(cat src/workerd/io/supported-compatibility-date.txt | tr -d '-').0" >> $GITHUB_OUTPUT;
   build-and-publish-types:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     needs: version
     steps:
       - uses: actions/checkout@v4
+        with:
+          show-progress: false
       - name: Cache
         id: cache
         uses: actions/cache@v4
+        # Use same cache and build configuration as release build, this allows us to keep download
+        # sizes small and generate types with optimization enabled, should be slightly faster.
         with:
           path: ~/bazel-disk-cache
-          # The types cache is significantly smaller than the whole cache (350MB as of writing), so
-          # we can probably afford for it to have its own cache key.
-          key: bazel-disk-cache-types-${{ runner.os }}-${{ hashFiles('.bazelversion', '.bazelrc', 'WORKSPACE') }}
-
-      - name: install dependencies
+          key: bazel-disk-cache-release-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.bazelversion', '.bazelrc', 'WORKSPACE') }}
+      - name: Setup Linux
         run: |
             export DEBIAN_FRONTEND=noninteractive
+            wget https://apt.llvm.org/llvm.sh
+            chmod +x llvm.sh
+            sudo ./llvm.sh 15
+            sudo apt-get install -y libunwind-15 libc++abi1-15 libc++1-15 libc++-15-dev
+            echo "build:linux --action_env=CC=/usr/lib/llvm-15/bin/clang --action_env=CXX=/usr/lib/llvm-15/bin/clang++" >> .bazelrc
+            echo "build:linux --host_action_env=CC=/usr/lib/llvm-15/bin/clang --host_action_env=CXX=/usr/lib/llvm-15/bin/clang++" >> .bazelrc
       - name: build types
         run: |
-            bazel build --disk_cache=~/bazel-disk-cache  --remote_cache=https://bazel:${{ secrets.BAZEL_CACHE_KEY }}@bazel-remote-cache.devprod.cloudflare.dev //types:types
+            bazel build --disk_cache=~/bazel-disk-cache --strip=always --remote_cache=https://bazel:${{ secrets.BAZEL_CACHE_KEY }}@bazel-remote-cache.devprod.cloudflare.dev --config=release_linux //types:types
       - name: Build package
         run: node npm/scripts/build-types-package.mjs
         env: