From 6098fc54920e04153ea1842ca8a58a52b28075da Mon Sep 17 00:00:00 2001
From: Jarred Sumner <jarred@jarredsumner.com>
Date: Thu, 16 May 2024 00:44:55 -0700
Subject: [PATCH] GitHub actions

---
 .github/workflows/build-darwin.yml  |  4 +++-
 .github/workflows/build-windows.yml |  2 +-
 .github/workflows/comment-lint.yml  |  2 +-
 Dockerfile                          |  8 +++++---
 scripts/env.sh                      | 24 ++++++++++++++----------
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build-darwin.yml b/.github/workflows/build-darwin.yml
index bbeb946bde..4b9845b139 100644
--- a/.github/workflows/build-darwin.yml
+++ b/.github/workflows/build-darwin.yml
@@ -28,7 +28,9 @@ on:
 
 env:
   LLVM_VERSION: 16
-  BUN_VERSION: 1.1.2
+  BUN_VERSION: 1.1.8
+  LC_CTYPE: "en_US.UTF-8"
+  LC_ALL: "en_US.UTF-8"
 
 jobs:
   build-submodules:
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 956d6feed3..57fa5a4746 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -29,7 +29,7 @@ on:
 env:
   # Must specify exact version of LLVM for Windows
   LLVM_VERSION: 16.0.6
-  BUN_VERSION: 1.1.2
+  BUN_VERSION: 1.1.8
 
 jobs:
   build-submodules:
diff --git a/.github/workflows/comment-lint.yml b/.github/workflows/comment-lint.yml
index e63ce2a3ce..e3ffc145d0 100644
--- a/.github/workflows/comment-lint.yml
+++ b/.github/workflows/comment-lint.yml
@@ -41,7 +41,7 @@ jobs:
         run: |
           # Copy to outputs
           echo "pr-number=$(cat pr-number.txt)" >> $GITHUB_OUTPUT
-          echo "text_output="$(cat format.log)" >> $GITHUB_OUTPUT
+          echo "text_output=$(cat format.log)" >> $GITHUB_OUTPUT
           echo "did_fail=$(cat did_fail.txt)" >> $GITHUB_OUTPUT
 
       - name: Find Comment
diff --git a/Dockerfile b/Dockerfile
index 2e65b1a74a..c9dcfff1eb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,6 +55,8 @@ ENV CXX=clang++-${LLVM_VERSION}
 ENV CC=clang-${LLVM_VERSION}
 ENV AR=/usr/bin/llvm-ar-${LLVM_VERSION}
 ENV LD=lld-${LLVM_VERSION}
+ENV LC_CTYPE=en_US.UTF-8
+ENV LC_ALL=en_US.UTF-8
 
 ENV SCCACHE_BUCKET=${SCCACHE_BUCKET}
 ENV SCCACHE_REGION=${SCCACHE_REGION}
@@ -454,7 +456,7 @@ COPY --from=bun-codegen-for-zig ${BUN_DIR}/packages/bun-error/dist ${BUN_DIR}/pa
 WORKDIR $BUN_DIR
 
 RUN --mount=type=cache,target=${CCACHE_DIR} \
-    --mount=type=cache,target=${ZIG_LOCAL_CACHE_DIR} \
+  --mount=type=cache,target=${ZIG_LOCAL_CACHE_DIR} \
   mkdir -p build \
   && bun run $BUN_DIR/src/codegen/bundle-modules.ts --debug=OFF $BUN_DIR/build \
   && cd build \
@@ -520,7 +522,7 @@ COPY --from=bun-cpp-objects ${BUN_DIR}/bun-webkit/lib ${BUN_DIR}/bun-webkit/lib
 WORKDIR $BUN_DIR/build
 
 RUN --mount=type=cache,target=${CCACHE_DIR} \
-    --mount=type=cache,target=${ZIG_LOCAL_CACHE_DIR} \
+  --mount=type=cache,target=${ZIG_LOCAL_CACHE_DIR} \
   cmake .. \
   -G Ninja \
   -DCMAKE_BUILD_TYPE=Release \
@@ -583,7 +585,7 @@ COPY --from=bun-cpp-objects ${BUN_DIR}/bun-webkit/lib ${BUN_DIR}/bun-webkit/lib
 WORKDIR $BUN_DIR/build
 
 RUN --mount=type=cache,target=${CCACHE_DIR} \
-    --mount=type=cache,target=${ZIG_LOCAL_CACHE_DIR} \
+  --mount=type=cache,target=${ZIG_LOCAL_CACHE_DIR} \
   cmake .. \
   -G Ninja \
   -DCMAKE_BUILD_TYPE=Release \
diff --git a/scripts/env.sh b/scripts/env.sh
index 70e56268cb..da0cdcdfd8 100755
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -6,6 +6,10 @@ export BUN_BASE_DIR=${BUN_BASE_DIR:-$(cd $SCRIPT_DIR && cd .. && pwd)}
 export BUN_DEPS_DIR=${BUN_DEPS_DIR:-$BUN_BASE_DIR/src/deps/}
 export BUN_DEPS_OUT_DIR=${BUN_DEPS_OUT_DIR:-$BUN_BASE_DIR/src/deps/}
 
+# Silence a perl script warning
+export LC_CTYPE="en_US.UTF-8"
+export LC_ALL="en_US.UTF-8"
+
 # this compiler detection could be better
 export CC=${CC:-$(which clang-16 || which clang || which cc)}
 export CXX=${CXX:-$(which clang++-16 || which clang++ || which c++)}
@@ -19,20 +23,20 @@ export CFLAGS='-O3 -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidd
 export CXXFLAGS='-O3 -fno-exceptions -fno-rtti -fvisibility=hidden -fvisibility-inlines-hidden -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer'
 
 export CMAKE_FLAGS=(
-  -DCMAKE_C_COMPILER="${CC}"
-  -DCMAKE_CXX_COMPILER="${CXX}"
-  -DCMAKE_C_FLAGS="$CFLAGS"
-  -DCMAKE_CXX_FLAGS="$CXXFLAGS"
-  -DCMAKE_BUILD_TYPE=Release
-  -DCMAKE_CXX_STANDARD=20
-  -DCMAKE_C_STANDARD=17
-  -DCMAKE_CXX_STANDARD_REQUIRED=ON
-  -DCMAKE_C_STANDARD_REQUIRED=ON
+    -DCMAKE_C_COMPILER="${CC}"
+    -DCMAKE_CXX_COMPILER="${CXX}"
+    -DCMAKE_C_FLAGS="$CFLAGS"
+    -DCMAKE_CXX_FLAGS="$CXXFLAGS"
+    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_CXX_STANDARD=20
+    -DCMAKE_C_STANDARD=17
+    -DCMAKE_CXX_STANDARD_REQUIRED=ON
+    -DCMAKE_C_STANDARD_REQUIRED=ON
 )
 
 if [[ $(uname -s) == 'Linux' ]]; then
     # Ensure we always use -std=gnu++20 on Linux
-    export CMAKE_FLAGS+=( -DCMAKE_CXX_EXTENSIONS=ON )
+    export CMAKE_FLAGS+=(-DCMAKE_CXX_EXTENSIONS=ON)
 fi
 
 if [[ $(uname -s) == 'Darwin' ]]; then