Skip to content

Commit 139ff96

Browse files
committed
Switch to another install LLVM action
1 parent 4bbd941 commit 139ff96

2 files changed

Lines changed: 8 additions & 13 deletions

File tree

‎.ci/common/build.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ mkdir -p "$BUILD_DIR"
1313
if [[ "$PLATFORM" == "win64" ]] || [[ "$PLATFORM" == "win32" ]]; then
1414
cmake -B "$BUILD_DIR" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DSCRATCHCPP_PLAYER_BUILD_UNIT_TESTS=OFF || exit 3
1515
elif [[ "$PLATFORM" == "linux_aarch64" ]]; then
16-
cmake -B "$BUILD_DIR" -DCMAKE_BUILD_TYPE=Release -DSCRATCHCPP_PLAYER_BUILD_UNIT_TESTS=OFF -DCMAKE_PREFIX_PATH="$QT_ROOT_DIR" -DCMAKE_TOOLCHAIN_FILE="$BUILD_TOOLCHAIN_CONFIG" -DCMAKE_FIND_ROOT_PATH="$QT_ROOT_DIR" -DQT_HOST_PATH="$QT_HOST_PATH" -DQT_HOST_CMAKE_DIR="$QT_HOST_PATH/lib/cmake" -DLLVM_NATIVE_TOOL_DIR="$LLVM_PATH/bin"
16+
LLVM_PATH=`dirname $(which llvm-tblgen)`
17+
echo "LLVM bin: $LLVM_PATH"
18+
cmake -B "$BUILD_DIR" -DCMAKE_BUILD_TYPE=Release -DSCRATCHCPP_PLAYER_BUILD_UNIT_TESTS=OFF -DCMAKE_PREFIX_PATH="$QT_ROOT_DIR" -DCMAKE_TOOLCHAIN_FILE="$BUILD_TOOLCHAIN_CONFIG" -DCMAKE_FIND_ROOT_PATH="$QT_ROOT_DIR" -DQT_HOST_PATH="$QT_HOST_PATH" -DQT_HOST_CMAKE_DIR="$QT_HOST_PATH/lib/cmake" -DLLVM_NATIVE_TOOL_DIR="$LLVM_PATH"
1719
else
1820
cmake -B "$BUILD_DIR" -DCMAKE_BUILD_TYPE=Release -DSCRATCHCPP_PLAYER_BUILD_UNIT_TESTS=OFF || exit 3
1921
fi

‎.github/workflows/linux-build.yml‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
- name: Maximize build space
2626
uses: easimon/maximize-build-space@master
2727
with:
28-
root-reserve-mb: 512
29-
swap-size-mb: 1024
28+
root-reserve-mb: 2048
29+
swap-size-mb: 256
3030
remove-dotnet: true
3131
remove-android: true
3232
remove-haskell: true
@@ -44,17 +44,10 @@ jobs:
4444
shell: bash
4545
## Install LLVM (for host build tools)
4646
- if: "!contains(matrix.arch, 'amd64')"
47-
name: Prepare large temp
48-
run: |
49-
mkdir -p "$GITHUB_WORKSPACE/tmp"
50-
echo "RUNNER_TEMP=$GITHUB_WORKSPACE/tmp" >> "$GITHUB_ENV"
51-
- if: "!contains(matrix.arch, 'amd64')"
52-
name: Install LLVM
53-
uses: KyleMayes/install-llvm-action@v2
47+
name: Setup LLVM
48+
uses: ZhongRuoyu/setup-llvm@v0
5449
with:
55-
version: "19.1.0"
56-
env: false
57-
directory: ${{ github.workspace }}/../llvm-native # get this from $LLVM_PATH
50+
llvm-version: 19
5851
## Install dependencies
5952
- if: contains(matrix.arch, 'amd64')
6053
name: Install dependencies

0 commit comments

Comments
 (0)