Skip to content

Commit 365e673

Browse files
committed
Fix nits
- Simplified GitHub actions configuration - Linked libzip publicly as zip.h is used in the ext/zip main header - Added basic dependencies back as another job will be added for downloading missing deps separately
1 parent cea6c85 commit 365e673

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

.github/workflows/ci.yaml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
os:
2929
- { label: ubuntu-latest }
3030
compiler:
31-
- { name: GNU13, CC: gcc-13, CXX: g++-13, packages: gcc-13 g++-13 }
32-
- { name: LLVM15, CC: clang-15, CXX: clang++-15, packages: clang-15 libomp-15-dev llvm-15-dev libc++-15-dev libc++abi1-15 lld-15 clang-tools-15 mlir-15-tools libmlir-15-dev }
31+
- { name: GNU, CC: gcc, CXX: g++, packages: gcc g++ }
32+
- { name: LLVM, CC: clang, CXX: clang++, packages: clang libomp-dev llvm-dev libc++-dev libc++abi1 lld clang-tools }
3333
build_type:
3434
- Release
3535
generator:
@@ -43,19 +43,17 @@ jobs:
4343
steps:
4444
- name: Install compiler ${{ matrix.compiler.name }}
4545
run: |
46-
# Remove azure mirror because it is unreliable and sometimes unpredictably leads to failed CI
47-
sudo sed -i 's/azure\.//' /etc/apt/sources.list
48-
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
49-
sudo add-apt-repository -y universe
50-
sudo add-apt-repository -y multiverse
5146
sudo apt-get update
52-
sudo apt-get -y install \
53-
${{ matrix.compiler.packages }}
47+
sudo apt-get -y install ${{ matrix.compiler.packages }}
5448
5549
- name: Install base dependencies
5650
run: |
51+
sudo apt-get update
5752
sudo apt-get -y install \
5853
build-essential \
54+
re2c \
55+
bison \
56+
libxml2-dev \
5957
libssl-dev \
6058
libpcre2-dev \
6159
libsqlite3-dev \

cmake/ext/zip/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ if(libzip_VERSION VERSION_EQUAL 1.3.1 OR libzip_VERSION VERSION_EQUAL 1.7.0)
9191
)
9292
endif()
9393

94-
target_link_libraries(php_ext_zip PRIVATE libzip::zip)
94+
# Link publicly for internal_functions files.
95+
target_link_libraries(php_ext_zip PUBLIC libzip::zip)
9596

9697
# Note: ZIP_STATIC needs to be defined when using static libzip on Windows only
9798
# since version 1.0 to 1.3.2

0 commit comments

Comments
 (0)