Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions .github/workflows/llvm-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ jobs:
config:
- {runner: 'Ubuntu 22.04', runs_on: 'ubuntu-22.04', target-os: 'ubuntu', arch: 'x64'}
- {runner: 'Ubuntu 22.04 ARM64', runs_on: 'ubuntu-22.04', target-os: 'ubuntu', arch: 'arm64'}
- {runner: 'CentOS 7', runs_on: ['self-hosted', 'CPU'], target-os: 'centos', arch: 'x64'}
- {runner: 'AlmaLinux 8', runs_on: ['self-hosted', 'CPU'], target-os: 'almalinux', arch: 'x64'}
- {runner: 'AlmaLinux 8 ARM64', runs_on: 'ubuntu-22.04-arm', target-os: 'almalinux', arch: 'arm64'}
- {runner: 'MacOS X64', runs_on: 'macos-13', target-os: 'macos', arch: 'x64'}
Expand Down Expand Up @@ -233,30 +232,6 @@ jobs:

tar czf "${{ env.llvm_install_dir }}.tar.gz" "${{ env.llvm_install_dir }}"


- name: Configure, Build, Test, and Install LLVM (CentOS)
if: matrix.config.target-os == 'centos'
run: |
# if this step crashes, it can leave behind a stale docker container
docker container prune -f
docker rmi -f $(docker images -q)

docker build --tag llvm-build --build-arg llvm_dir=llvm-project \
-f llvm-build/.github/workflows/llvm-build/centos.Dockerfile .

# Create temporary container to copy cache and installed artifacts.
CONTAINER_ID=$(docker create llvm-build)
docker cp "${CONTAINER_ID}:/install" "${{ env.llvm_install_dir }}"
tar czf "${{ env.llvm_install_dir }}.tar.gz" "${{ env.llvm_install_dir }}"

# We remove the existing directory, otherwise docker will
# create a subdirectory inside the existing directory.
rm -rf "${{ env.SCCACHE_DIR }}"
docker cp "${CONTAINER_ID}:/sccache" "${{ env.SCCACHE_DIR }}"
sudo chown -R "$(id -u -n):$(id -g -n)" "${{ env.SCCACHE_DIR }}"

docker rm "${CONTAINER_ID}"

- name: Configure, Build, Test, and Install LLVM (AlmaLinux)
if: matrix.config.target-os == 'almalinux'
run: |
Expand Down
56 changes: 0 additions & 56 deletions .github/workflows/llvm-build/centos.Dockerfile

This file was deleted.

6 changes: 1 addition & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,10 @@ def get_llvm_package_info():
# Ubuntu 22 LTS (v2.35)
# Ubuntu 20 LTS (v2.31)
system_suffix = "ubuntu-x64"
elif vglibc > 217:
else:
# Manylinux_2.28 (v2.28)
# AlmaLinux 8 (v2.28)
system_suffix = "almalinux-x64"
else:
# Manylinux_2014 (v2.17)
# CentOS 7 (v2.17)
system_suffix = "centos-x64"
else:
print(
f"LLVM pre-compiled image is not available for {system}-{arch}. Proceeding with user-configured LLVM from source build."
Expand Down
Loading