Skip to content

Commit 6e5f854

Browse files
committed
ci: support packaging on Rocky 10 and Debian 13
1 parent 6fcfdc2 commit 6e5f854

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

.github/workflows/package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
matrix:
2727
arch: [ ubuntu-24.04, ubuntu-24.04-arm ]
28-
base_image: [ anolis8, rocky8, rocky9 ]
28+
base_image: [ anolis8, rocky8, rocky9, rocky10 ]
2929
runs-on: ${{ matrix.arch }}
3030
steps:
3131
- name: fetch source code
@@ -72,7 +72,7 @@ jobs:
7272
strategy:
7373
matrix:
7474
arch: [ ubuntu-24.04, ubuntu-24.04-arm ]
75-
base_image: [ ubuntu20.04, ubuntu22.04, ubuntu24.04, debian11, debian12 ]
75+
base_image: [ ubuntu20.04, ubuntu22.04, ubuntu24.04, debian11, debian12, debian13 ]
7676
runs-on: ${{ matrix.arch }}
7777
steps:
7878
- name: fetch source code

build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,13 @@ export PG_COLOR=auto
228228
export LANG=en_US.UTF-8
229229
export LANGUAGE=en_US.UTF-8
230230
export LC_ALL=en_US.UTF-8
231-
export COPT="-Werror ${COPT-}"
232231
export CFLAGS="$compiler_flag ${CFLAGS-}"
233232
export CXXFLAGS="$compiler_flag ${CXXFLAGS-}"
234233
export LDFLAGS="-Wl,-rpath,'\$\$ORIGIN/../lib:$base_dir/lib',--build-id=sha1 ${LDFLAGS-}"
235234
export PATH=$base_dir/bin:${PATH-}
235+
if [[ "${COPT-}" != *-Wno-error* ]]; then
236+
export COPT="-Werror ${COPT-}"
237+
fi
236238

237239
# For now, we have prepared all the options and envs, let's do the actual job.
238240

package/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: polardb-for-postgresql
22
Maintainer: mrdrivingduck <[email protected]>
3-
Depends: libicu66 | libicu67 | libicu70 | libicu72 | libicu74, libkrb5-3, libldap-2.4-2 | libldap-2.5-0 | libldap2
3+
Depends: libicu66 | libicu67 | libicu70 | libicu72 | libicu74 | libicu76, libkrb5-3, libldap-2.4-2 | libldap-2.5-0 | libldap2
44
Section: database
55
Priority: optional
66
Homepage: https://github.com/ApsaraDB/PolarDB-for-PostgreSQL

package/rpm/build-rpm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ echo "%_topdir $TOP_DIR" > $RPM_MACROS
3030
echo "%_release $release" >> $RPM_MACROS
3131

3232
rm -rf $TOP_DIR
33-
RELEASE=$release rpmbuild -bb --buildroot $TOP_DIR/BUILD PolarDB.spec;st=$?
33+
RELEASE=$release rpmbuild --noclean -bb --buildroot $TOP_DIR/BUILD PolarDB.spec;st=$?
3434

3535
if [ "$st" != 0 ]; then
3636
exit $st

0 commit comments

Comments
 (0)