Skip to content

Commit 98fbe91

Browse files
authored
Update emscripten.yml
1 parent 45e7441 commit 98fbe91

File tree

1 file changed

+8
-105
lines changed

1 file changed

+8
-105
lines changed

.github/workflows/emscripten.yml

Lines changed: 8 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,22 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
include:
24-
- name: ubu24-arm-gcc12-clang-repl-19-emscripten
24+
- name: ubu24-arm-clang-repl-19-emscripten
2525
os: ubuntu-24.04-arm
26-
compiler: gcc-12
2726
clang-runtime: '19'
2827
cling: Off
2928
llvm_enable_projects: "clang;lld"
3029
llvm_targets_to_build: "WebAssembly"
3130
emsdk_ver: "3.1.73"
32-
- name: osx15-arm-clang-clang-repl-19-emscripten
31+
- name: osx15-arm-clang-repl-19-emscripten
3332
os: macos-15
34-
compiler: clang
3533
clang-runtime: '19'
3634
cling: Off
3735
llvm_enable_projects: "clang;lld"
3836
llvm_targets_to_build: "WebAssembly"
3937
emsdk_ver: "3.1.73"
40-
- name: ubu24-x86-gcc12-clang-repl-19-emscripten
38+
- name: ubu24-x86-clang-repl-19-emscripten
4139
os: ubuntu-24.04
42-
compiler: gcc-12
4340
clang-runtime: '19'
4441
cling: Off
4542
llvm_enable_projects: "clang;lld"
@@ -142,92 +139,6 @@ jobs:
142139
$env:ncpus=$([Environment]::ProcessorCount)
143140
echo "ncpus=$env:ncpus" >> $env:GITHUB_ENV
144141
145-
- name: Setup compiler on Linux
146-
if: ${{ runner.os == 'Linux' && steps.cache.outputs.cache-hit != 'true' }}
147-
run: |
148-
# https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html
149-
vers="${compiler#*-}"
150-
os_codename="`cat /etc/os-release | grep UBUNTU_CODENAME | cut -d = -f 2`"
151-
##sudo apt update
152-
if [[ "${{ matrix.compiler }}" == *"gcc"* ]]; then
153-
sudo apt install -y gcc-${vers} g++-${vers} lld
154-
echo "CC=gcc-${vers}" >> $GITHUB_ENV
155-
echo "CXX=g++-${vers}" >> $GITHUB_ENV
156-
else
157-
if ! sudo apt install -y clang-${vers}; then
158-
curl https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
159-
echo "deb https://apt.llvm.org/${os_codename}/ llvm-toolchain-${os_codename}-${vers} main" | sudo tee -a /etc/apt/sources.list
160-
sudo apt-get update
161-
sudo apt-get install -y clang-${vers}
162-
fi
163-
echo "CC=clang-${vers}" >> $GITHUB_ENV
164-
echo "CXX=clang++-${vers}" >> $GITHUB_ENV
165-
fi
166-
env:
167-
compiler: ${{ matrix.compiler }}
168-
169-
- name: Setup compiler on macOS
170-
if: ${{ runner.os == 'macOS' && steps.cache.outputs.cache-hit != 'true' }}
171-
run: |
172-
vers="${compiler#*-}"
173-
if [[ "${{ matrix.compiler }}" == *"gcc"* ]]; then
174-
brew install "gcc@$vers"
175-
echo "CC=gcc-${vers}" >> $GITHUB_ENV
176-
echo "CXX=g++-${vers}" >> $GITHUB_ENV
177-
else
178-
export ARCHITECHURE=$(uname -m)
179-
if [[ "$ARCHITECHURE" == "arm64" ]]; then
180-
cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]')
181-
if [[ "${cling_on}" == "ON" ]]; then
182-
brew install llvm@15
183-
brew remove llvm@18
184-
brew cleanup
185-
#FIXME: Do not believe setting all these environment variables are necessary
186-
# They were set to avoid using Xcodes libc++ and to stop CppInterOp using llvm@18 in tests
187-
echo 'LDFLAGS="-L/opt/homebrew/opt/llvm@15/lib/ -L/opt/homebrew/opt/llvm@15/c++/"' >> $GITHUB_ENV
188-
echo 'CPPFLAGS="-I/opt/homebrew/opt/llvm@15/include"' >> $GITHUB_ENV
189-
echo 'CPATH="/opt/homebrew/include/"' >> $GITHUB_ENV
190-
echo 'LIBRARY_PATH="/opt/homebrew/lib/"' >> $GITHUB_ENV
191-
echo "CC=$(brew --prefix llvm@15)/bin/clang" >> $GITHUB_ENV
192-
echo "CXX=$(brew --prefix llvm@15)/bin/clang++" >> $GITHUB_ENV
193-
else
194-
echo "CC=$(brew --prefix llvm@18)/bin/clang" >> $GITHUB_ENV
195-
echo "CXX=$(brew --prefix llvm@18)/bin/clang++" >> $GITHUB_ENV
196-
fi
197-
else
198-
echo "CC=$(brew --prefix llvm@15)/bin/clang" >> $GITHUB_ENV
199-
echo "CXX=$(brew --prefix llvm@15)/bin/clang++" >> $GITHUB_ENV
200-
fi
201-
fi
202-
echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
203-
env:
204-
compiler: ${{ matrix.compiler }}
205-
206-
#Section slightly modified version of
207-
#https://github.com/vgvassilev/clad/blob/40d8bec11bde47b14a281078183a4f6147abeac5/.github/workflows/ci.yml#L510C1-L534C10
208-
- name: Setup compiler on Windows
209-
if: ${{ runner.os == 'windows' && steps.cache.outputs.cache-hit != 'true' }}
210-
run: |
211-
if ( "${{ matrix.compiler }}" -imatch "clang" )
212-
{
213-
$ver="${{ matrix.compiler }}".split("-")[1]
214-
choco install llvm --version=$ver --no-progress -my
215-
clang --version
216-
#
217-
$env:CC="clang"
218-
$env:CXX="clang++"
219-
echo "CC=clang" >> $env:GITHUB_ENV
220-
echo "CXX=clang++" >> $env:GITHUB_ENV
221-
}
222-
elseif ( "${{ matrix.compiler }}" -imatch "msvc" )
223-
{
224-
# MSVC is builtin in container image
225-
}
226-
else
227-
{
228-
echo "Unsupported compiler - fix YAML file"
229-
}
230-
231142
- name: Install deps on Windows
232143
if: ${{ runner.os == 'windows' && steps.cache.outputs.cache-hit != 'true' }}
233144
run: |
@@ -302,7 +213,7 @@ jobs:
302213
-DLLVM_BUILD_TOOLS=OFF \
303214
-DLLVM_ENABLE_LIBPFM=OFF \
304215
../llvm
305-
emmake ninja clang cling lld gtest_main -j ${{ env.ncpus }}
216+
emmake ninja clang cling lld gtest_main
306217
else
307218
# Apply patches
308219
llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
@@ -331,7 +242,7 @@ jobs:
331242
-DLLVM_ENABLE_LIBPFM=OFF \
332243
-G Ninja \
333244
../llvm
334-
emmake ninja libclang clangInterpreter clangStaticAnalyzerCore lldWasm -j ${{ env.ncpus }}
245+
emmake ninja libclang clangInterpreter clangStaticAnalyzerCore lldWasm
335246
fi
336247
rm -rf ./NATIVE/
337248
cd ../
@@ -462,23 +373,20 @@ jobs:
462373
fail-fast: false
463374
matrix:
464375
include:
465-
- name: ubu24-x86-gcc12-clang-repl-19-emscripten_wasm
376+
- name: ubu24-x86-clang-repl-19-emscripten_wasm
466377
os: ubuntu-24.04
467-
compiler: gcc-12
468378
clang-runtime: '19'
469379
cling: Off
470380
micromamba_shell_init: bash
471381
emsdk_ver: "3.1.73"
472-
- name: osx15-arm-clang-clang-repl-19-emscripten_wasm
382+
- name: osx15-arm-clang-repl-19-emscripten_wasm
473383
os: macos-15
474-
compiler: clang
475384
clang-runtime: '19'
476385
cling: Off
477386
micromamba_shell_init: bash
478387
emsdk_ver: "3.1.73"
479-
- name: ubu24-arm-gcc12-clang-repl-19-emscripten_wasm
388+
- name: ubu24-arm-clang-repl-19-emscripten_wasm
480389
os: ubuntu-24.04-arm
481-
compiler: gcc-12
482390
clang-runtime: '19'
483391
cling: Off
484392
micromamba_shell_init: bash
@@ -489,11 +397,6 @@ jobs:
489397
with:
490398
fetch-depth: 0
491399

492-
- name: Set up Python
493-
uses: actions/setup-python@v5
494-
with:
495-
python-version: '3.11'
496-
497400
- name: Save PR Info on Unix systems
498401
if: ${{ runner.os != 'windows' }}
499402
run: |

0 commit comments

Comments
 (0)