From 92022132740e27474485fe58041917f28be5d2ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sat, 7 Jan 2023 23:02:15 +0100 Subject: [PATCH] ci: remove use of repository ppa:ondrej/php Now the CI uses the standard PHP version (8.1) from Ubuntu 22.04. --- .github/workflows/ci.yml | 8 ++------ ChangeLog.adoc | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82b7bfef9..251aa8fe3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ on: - pull_request env: - WEECHAT_DEPENDENCIES: devscripts equivs python3-pip autopoint cmake ninja-build lcov pkg-config libncursesw5-dev gem2deb libperl-dev python3-dev libaspell-dev liblua5.3-dev tcl8.6-dev guile-3.0-dev libv8-dev libcurl4-gnutls-dev libgcrypt20-dev libgnutls28-dev libzstd-dev zlib1g-dev curl libcpputest-dev php8.0-dev libphp8.0-embed libargon2-dev libsodium-dev flake8 pylint python3-bandit asciidoctor ruby-pygments.rb shellcheck + WEECHAT_DEPENDENCIES: devscripts equivs python3-pip autopoint cmake ninja-build lcov pkg-config libncursesw5-dev gem2deb libperl-dev python3-dev libaspell-dev liblua5.3-dev tcl8.6-dev guile-3.0-dev libv8-dev libcurl4-gnutls-dev libgcrypt20-dev libgnutls28-dev libzstd-dev zlib1g-dev curl libcpputest-dev php-dev libphp-embed libargon2-dev libsodium-dev flake8 pylint python3-bandit asciidoctor ruby-pygments.rb shellcheck jobs: @@ -33,9 +33,7 @@ jobs: - name: Install dependencies run: | - sudo apt-add-repository --yes ppa:ondrej/php sudo apt-get update -qq - sudo apt-get --yes purge php8.1-dev sudo apt-get --yes --no-install-recommends install ${{ env.WEECHAT_DEPENDENCIES }} sudo -H pip3 install --ignore-installed msgcheck @@ -141,10 +139,8 @@ jobs: - name: Install dependencies run: | - sudo apt-add-repository --yes ppa:ondrej/php sudo apt-get update -qq - sudo apt-get --yes purge php8.1-dev - sudo apt-get --yes --no-install-recommends install ${{ env.WEECHAT_DEPENDENCIES }} php-dev + sudo apt-get --yes --no-install-recommends install ${{ env.WEECHAT_DEPENDENCIES }} - name: Test Debian patches run: ./tools/build_debian.sh test-patches diff --git a/ChangeLog.adoc b/ChangeLog.adoc index a756ef367..9c79e0876 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -58,6 +58,7 @@ Bug fixes:: Tests:: + * ci: remove use of repository ppa:ondrej/php, use standard PHP version (8.1) from Ubuntu 22.04 * core: add script check_scripts.sh * core: add script check_curl_symbols.py * gui: add tests on input functions