mirror of
https://github.com/zen-browser/desktop.git
synced 2026-06-17 08:51:12 +00:00
gh-14208: Install LLVM 22 for rust 1.95 (gh-14222)
This commit is contained in:
6
.github/workflows/linux-release-build.yml
vendored
6
.github/workflows/linux-release-build.yml
vendored
@@ -83,6 +83,12 @@ jobs:
|
||||
run: |
|
||||
npm ci
|
||||
|
||||
- name: Install LLVM
|
||||
run: |
|
||||
wget https://apt.llvm.org/llvm.sh
|
||||
chmod +x llvm.sh
|
||||
sudo ./llvm.sh $(cat .llvm-version)
|
||||
|
||||
- name: Load Surfer CI setup
|
||||
run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
|
||||
|
||||
|
||||
6
.github/workflows/macos-release-build.yml
vendored
6
.github/workflows/macos-release-build.yml
vendored
@@ -114,6 +114,12 @@ jobs:
|
||||
run: |
|
||||
npm ci
|
||||
|
||||
- name: Install LLVM
|
||||
run: |
|
||||
wget https://apt.llvm.org/llvm.sh
|
||||
chmod +x llvm.sh
|
||||
sudo ./llvm.sh $(cat .llvm-version)
|
||||
|
||||
- name: Load surfer CI setup
|
||||
run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
|
||||
|
||||
|
||||
9
.github/workflows/src/release-build.sh
vendored
9
.github/workflows/src/release-build.sh
vendored
@@ -8,6 +8,15 @@ if command -v apt-get &> /dev/null; then
|
||||
sudo apt-get install -y xvfb libnvidia-egl-wayland1 mesa-utils libgl1-mesa-dri
|
||||
fi
|
||||
|
||||
LLVM_VERSION=$(cat .llvm-version)
|
||||
if test -d "$HOME/.mozbuild/clang-$LLVM_VERSION/bin"; then
|
||||
export CC="$HOME/.mozbuild/clang-$LLVM_VERSION/bin/clang"
|
||||
export CXX="$HOME/.mozbuild/clang-$LLVM_VERSION/bin/clang++"
|
||||
else
|
||||
export CC=clang-$LLVM_VERSION
|
||||
export CXX=clang-$LLVM_VERSION++
|
||||
fi
|
||||
|
||||
mkdir -p ~/.zen-keys
|
||||
echo "$ZEN_SAFEBROWSING_API_KEY" > ~/.zen-keys/safebrowsing.dat
|
||||
echo "$ZEN_MOZILLA_API_KEY" > ~/.zen-keys/mozilla.dat
|
||||
|
||||
9
.github/workflows/windows-release-build.yml
vendored
9
.github/workflows/windows-release-build.yml
vendored
@@ -87,6 +87,12 @@ jobs:
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y python3 python3-pip dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm --fix-missing
|
||||
|
||||
- name: Install LLVM
|
||||
run: |
|
||||
wget https://apt.llvm.org/llvm.sh
|
||||
chmod +x llvm.sh
|
||||
sudo ./llvm.sh $(cat .llvm-version)
|
||||
|
||||
- name: Load Surfer CI setup
|
||||
run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
|
||||
|
||||
@@ -234,7 +240,8 @@ jobs:
|
||||
ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
|
||||
ZEN_SAFEBROWSING_API_KEY: ${{ secrets.ZEN_SAFEBROWSING_API_KEY }}
|
||||
ZEN_MOZILLA_API_KEY: ${{ secrets.ZEN_MOZILLA_API_KEY }}
|
||||
ZEN_GOOGLE_LOCATION_SERVICE_API_KEY: ${{ secrets.ZEN_GOOGLE_LOCATION_SERVICE_API_KEY }}
|
||||
# Firefox doesn't support location service for Windows
|
||||
# ZEN_GOOGLE_LOCATION_SERVICE_API_KEY: ${{ secrets.ZEN_GOOGLE_LOCATION_SERVICE_API_KEY }}
|
||||
run: |
|
||||
set -x
|
||||
dos2unix configs/windows/mozconfig
|
||||
|
||||
1
.llvm-version
Normal file
1
.llvm-version
Normal file
@@ -0,0 +1 @@
|
||||
22
|
||||
@@ -2,15 +2,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
# Setting the compiler based on the existence of clang bin directory
|
||||
if test -d "$HOME/.mozbuild/clang/bin"; then
|
||||
export CC="$HOME/.mozbuild/clang/bin/clang"
|
||||
export CXX="$HOME/.mozbuild/clang/bin/clang++"
|
||||
else
|
||||
export CC=clang
|
||||
export CXX=clang++
|
||||
fi
|
||||
|
||||
if test "$ZEN_RELEASE"; then
|
||||
if test "$SURFER_COMPAT" = "x86_64"; then
|
||||
ac_add_options --target=x86_64-pc-linux
|
||||
|
||||
Reference in New Issue
Block a user