From ea76aa7648c89f20001e355c60b14556ca295715 Mon Sep 17 00:00:00 2001 From: Ramon Asuncion Date: Thu, 28 May 2026 02:27:04 -0400 Subject: [PATCH 1/2] Revert "Merge pull request #86 from subrange/fix-release-llvm-repo" This reverts commit a4c97a6ea7b68b253738a303f137f9a29e67b7e0, reversing changes made to d0e62f2440cd12cdc9f601b21d835b71b3ae8677. --- .github/workflows/release.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ff36b020c..61af5c4c6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,16 +14,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Install LLVM 19 from apt.llvm.org - run: | - wget -O llvm.sh https://apt.llvm.org/llvm.sh - chmod +x llvm.sh - sudo ./llvm.sh 19 - sudo apt-get install -y llvm-19-dev - - - name: Install build tools + - name: Install LLVM and build tools run: | + sudo apt-get update sudo apt-get install -y \ + llvm-19 llvm-19-dev clang-19 \ ninja-build cmake python3 \ zlib1g-dev libxml2-dev libzstd-dev From 23c43614eb8d869ec4f0b378c5db3268916bb0f9 Mon Sep 17 00:00:00 2001 From: Ramon Asuncion Date: Thu, 28 May 2026 02:27:04 -0400 Subject: [PATCH 2/2] Revert "Merge pull request #83 from subrange/release-workflow" This reverts commit fe23359dcd985519d49dbdfdd0f0bcd0ec46fbe4, reversing changes made to 86224f1e3803a9907460c035dcf30932d4b28d8e. --- .github/workflows/release.yml | 62 ----------------------------------- CMakeLists.txt | 4 +-- 2 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 61af5c4c6..000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: Release - -on: - push: - tags: ['v*'] - -permissions: - contents: write - -jobs: - linux-x86_64: - runs-on: ubuntu-22.04 - - steps: - - uses: actions/checkout@v4 - - - name: Install LLVM and build tools - run: | - sudo apt-get update - sudo apt-get install -y \ - llvm-19 llvm-19-dev clang-19 \ - ninja-build cmake python3 \ - zlib1g-dev libxml2-dev libzstd-dev - - - name: Configure - run: | - cmake -S . -B build \ - -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_DIR=/usr/lib/llvm-19 \ - -DCMAKE_C_COMPILER=clang-19 \ - -DCMAKE_CXX_COMPILER=clang++-19 \ - -DCERAMIC_STATIC_LLVM=ON \ - -DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -static-libgcc" - - - name: Build - run: cmake --build build - - - name: Stage release tree - run: | - tag="${GITHUB_REF_NAME}" - name="ceramic-${tag}-linux-x86_64" - mkdir -p "dist/${name}/bin" - cp build/compiler/ceramic "dist/${name}/bin/" - cp -r lib-ceramic "dist/${name}/" - cp LICENSE LICENSE.txt README.md "dist/${name}/" 2>/dev/null || true - echo "ARCHIVE_NAME=${name}" >> "$GITHUB_ENV" - - - name: Archive - run: | - cd dist - tar -czf "${ARCHIVE_NAME}.tar.gz" "${ARCHIVE_NAME}" - sha256sum "${ARCHIVE_NAME}.tar.gz" > "${ARCHIVE_NAME}.tar.gz.sha256" - - - name: Publish release - uses: softprops/action-gh-release@v2 - with: - files: | - dist/${{ env.ARCHIVE_NAME }}.tar.gz - dist/${{ env.ARCHIVE_NAME }}.tar.gz.sha256 - draft: true - generate_release_notes: true diff --git a/CMakeLists.txt b/CMakeLists.txt index 1093529df..4425198ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,9 +28,7 @@ if(UNIX) message("-- Using LLVM ${LLVM_PACKAGE_VERSION}: ${LLVM_INSTALL_PREFIX}") message("-- LLVM include dir: ${LLVM_INCLUDE_DIRS}") - option(CERAMIC_STATIC_LLVM "Link LLVM components statically" OFF) - - if(LLVM_LINK_LLVM_DYLIB AND NOT CERAMIC_STATIC_LLVM) + if(LLVM_LINK_LLVM_DYLIB) set(LLVM_LIBS LLVM) else() llvm_map_components_to_libnames(LLVM_LIBS all)