From bde82486b0ff3e63dd7afad5a5c820021c991446 Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Wed, 12 Feb 2025 10:17:23 +1100 Subject: [PATCH 1/5] update workflows to ubuntu-24.04 ubuntu 20.04 is being deprecated, and will fully unsupported in 2024-04-01 --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/license.yml | 2 +- .github/workflows/publish.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d6bd722a..9b484901 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: name: Required needs: - ci - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Check results run: | @@ -41,7 +41,7 @@ jobs: fail-fast: false matrix: os: - - ubuntu-20.04 + - ubuntu-24.04 - macos-14 php-version: - "7.0" @@ -61,7 +61,7 @@ jobs: uses: actions/checkout@v2 - name: Install libclang for Linux - if: matrix.os == 'ubuntu-20.04' + if: matrix.os == 'ubuntu-24.04' run: sudo apt-get install -y llvm-10-dev libclang-10-dev - name: Setup libclang for Macos @@ -77,7 +77,7 @@ jobs: tools: php-config - name: Setup php-fpm for Linux - if: matrix.os == 'ubuntu-20.04' + if: matrix.os == 'ubuntu-24.04' run: | sudo apt-get install -y php${{ matrix.php-version }}-fpm sudo rm -f /usr/sbin/php-fpm diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index 8676d60f..fdcce485 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -20,7 +20,7 @@ on: jobs: license-check: name: License check - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 729cee22..f948375e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -26,7 +26,7 @@ jobs: publish: name: Publish - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v2 From 35141d63b3b19735e289aa48fc2352869a6895b5 Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Wed, 12 Feb 2025 10:24:53 +1100 Subject: [PATCH 2/5] llvm + libclang 18 --- .github/workflows/ci.yml | 2 +- .github/workflows/publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b484901..2c479684 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: - name: Install libclang for Linux if: matrix.os == 'ubuntu-24.04' - run: sudo apt-get install -y llvm-10-dev libclang-10-dev + run: sudo apt-get install -y llvm-18-dev libclang-18-dev - name: Setup libclang for Macos if: matrix.os == 'macos-14' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f948375e..56ab3d10 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@v2 - name: Install libclang - run: sudo apt-get install -y llvm-10-dev libclang-10-dev + run: sudo apt-get install -y llvm-18-dev libclang-18-dev - name: Setup PHP uses: shivammathur/setup-php@v2 From 7de40256a07f0f7e812737c7c22f27b9fb764023 Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Wed, 12 Feb 2025 10:29:16 +1100 Subject: [PATCH 3/5] 22.04 + llvm 18 --- .github/workflows/ci.yml | 10 +++++----- .github/workflows/license.yml | 2 +- .github/workflows/publish.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c479684..345f3149 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,14 +22,14 @@ env: CARGO_TERM_COLOR: always RUST_BACKTRACE: "1" RUSTFLAGS: "-D warnings" - LLVM_CONFIG_PATH: llvm-config-10 + LLVM_CONFIG_PATH: llvm-config-18 jobs: required: name: Required needs: - ci - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 steps: - name: Check results run: | @@ -41,7 +41,7 @@ jobs: fail-fast: false matrix: os: - - ubuntu-24.04 + - ubuntu-22.04 - macos-14 php-version: - "7.0" @@ -61,7 +61,7 @@ jobs: uses: actions/checkout@v2 - name: Install libclang for Linux - if: matrix.os == 'ubuntu-24.04' + if: matrix.os == 'ubuntu-22.04' run: sudo apt-get install -y llvm-18-dev libclang-18-dev - name: Setup libclang for Macos @@ -77,7 +77,7 @@ jobs: tools: php-config - name: Setup php-fpm for Linux - if: matrix.os == 'ubuntu-24.04' + if: matrix.os == 'ubuntu-22.04' run: | sudo apt-get install -y php${{ matrix.php-version }}-fpm sudo rm -f /usr/sbin/php-fpm diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index fdcce485..b606b48e 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -20,7 +20,7 @@ on: jobs: license-check: name: License check - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 56ab3d10..c9a408ae 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,14 +19,14 @@ env: CARGO_TERM_COLOR: always RUST_BACKTRACE: "1" RUSTFLAGS: "-D warnings" - LLVM_CONFIG_PATH: llvm-config-10 + LLVM_CONFIG_PATH: llvm-config-18 CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} jobs: publish: name: Publish - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v2 From 76a6b551af029935def8ad834d8fb19b6413a328 Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Wed, 12 Feb 2025 10:31:19 +1100 Subject: [PATCH 4/5] llvm14 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/publish.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 345f3149..6a574fc2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ env: CARGO_TERM_COLOR: always RUST_BACKTRACE: "1" RUSTFLAGS: "-D warnings" - LLVM_CONFIG_PATH: llvm-config-18 + LLVM_CONFIG_PATH: llvm-config-14 jobs: required: @@ -62,7 +62,7 @@ jobs: - name: Install libclang for Linux if: matrix.os == 'ubuntu-22.04' - run: sudo apt-get install -y llvm-18-dev libclang-18-dev + run: sudo apt-get install -y llvm-14-dev libclang-14-dev - name: Setup libclang for Macos if: matrix.os == 'macos-14' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c9a408ae..24d60a87 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,7 +19,7 @@ env: CARGO_TERM_COLOR: always RUST_BACKTRACE: "1" RUSTFLAGS: "-D warnings" - LLVM_CONFIG_PATH: llvm-config-18 + LLVM_CONFIG_PATH: llvm-config-14 CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} jobs: @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@v2 - name: Install libclang - run: sudo apt-get install -y llvm-18-dev libclang-18-dev + run: sudo apt-get install -y llvm-14-dev libclang-14-dev - name: Setup PHP uses: shivammathur/setup-php@v2 From e1ea414696cb7d0f9d7c5dd525667482287f3577 Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Wed, 12 Feb 2025 10:36:18 +1100 Subject: [PATCH 5/5] apt update before install --- .github/workflows/ci.yml | 13 +++++++------ .github/workflows/license.yml | 2 +- .github/workflows/publish.yml | 6 +++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a574fc2..36c9d7b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,14 +22,14 @@ env: CARGO_TERM_COLOR: always RUST_BACKTRACE: "1" RUSTFLAGS: "-D warnings" - LLVM_CONFIG_PATH: llvm-config-14 + LLVM_CONFIG_PATH: llvm-config-18 jobs: required: name: Required needs: - ci - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Check results run: | @@ -41,7 +41,7 @@ jobs: fail-fast: false matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 - macos-14 php-version: - "7.0" @@ -61,8 +61,8 @@ jobs: uses: actions/checkout@v2 - name: Install libclang for Linux - if: matrix.os == 'ubuntu-22.04' - run: sudo apt-get install -y llvm-14-dev libclang-14-dev + if: matrix.os == 'ubuntu-24.04' + run: sudo apt-get update && sudo apt-get install -y llvm-18-dev libclang-18-dev - name: Setup libclang for Macos if: matrix.os == 'macos-14' @@ -77,8 +77,9 @@ jobs: tools: php-config - name: Setup php-fpm for Linux - if: matrix.os == 'ubuntu-22.04' + if: matrix.os == 'ubuntu-24.04' run: | + sudo apt-get update sudo apt-get install -y php${{ matrix.php-version }}-fpm sudo rm -f /usr/sbin/php-fpm sudo ln -s /usr/sbin/php-fpm${{ matrix.php-version }} /usr/sbin/php-fpm diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index b606b48e..fdcce485 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -20,7 +20,7 @@ on: jobs: license-check: name: License check - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 24d60a87..73b87065 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,20 +19,20 @@ env: CARGO_TERM_COLOR: always RUST_BACKTRACE: "1" RUSTFLAGS: "-D warnings" - LLVM_CONFIG_PATH: llvm-config-14 + LLVM_CONFIG_PATH: llvm-config-18 CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} jobs: publish: name: Publish - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v2 - name: Install libclang - run: sudo apt-get install -y llvm-14-dev libclang-14-dev + run: sudo apt-get install -y llvm-18-dev libclang-18-dev - name: Setup PHP uses: shivammathur/setup-php@v2