Fix deb rules compatibility (#206)

* workaround debian 10 and ubuntu 20.04

* add more Debian/Ubuntu to CI
This commit is contained in:
Cyano Hao 2024-02-22 10:31:07 +08:00 committed by GitHub
parent 77bca7fd78
commit 5ada4b6e4b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 40 additions and 17 deletions

View File

@ -172,21 +172,17 @@ jobs:
name: Windows MSVC ARM64EC (do not use) name: Windows MSVC ARM64EC (do not use)
path: pkg/ path: pkg/
deb: debian:
name: Deb name: Debian
strategy: strategy:
matrix: matrix:
image: arch: [amd64, i386]
- "debian:10" # oldest LTS version: ["10", "11", "12", sid]
- "ubuntu:23.10" # latest stable
- "debian:sid" # rolling
include: include:
- image: debian:10 - arch: amd64
displayImage: debian-10 platform: linux/amd64
- image: ubuntu:23.10 - arch: i386
displayImage: ubuntu-23.10 platform: linux/386
- image: debian:sid
displayImage: debian-sid
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -195,16 +191,41 @@ jobs:
- name: Fetch container image - name: Fetch container image
run: | run: |
podman pull --platform linux/amd64 docker.io/amd64/${{ matrix.image }} podman pull --platform ${{ matrix.platform }} docker.io/${{ matrix.arch }}/debian:${{ matrix.version }}
- name: Build - name: Build
run: | run: |
podman run --rm -e SOURCE_DIR=/src -v $GITHUB_WORKSPACE:/src --platform linux/amd64 ${{ matrix.image }} /src/packages/debian/01-in-docker.sh podman run --rm -e SOURCE_DIR=/src -v $GITHUB_WORKSPACE:/src --platform linux/amd64 debian:${{ matrix.version }} /src/packages/debian/01-in-docker.sh
- name: Upload - name: Upload
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: Deb - image=${{ matrix.displayImage }} name: Debian ${{ matrix.version }} ${{ matrix.arch }}
path: dist/*.deb
ubuntu:
name: Ubuntu
strategy:
matrix:
version: ["20.04", "22.04", "23.10", "devel"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Fetch container image
run: |
podman pull --platform linux/amd64 docker.io/amd64/ubuntu:${{ matrix.version }}
- name: Build
run: |
podman run --rm -e SOURCE_DIR=/src -v $GITHUB_WORKSPACE:/src --platform linux/amd64 ubuntu:${{ matrix.version }} /src/packages/debian/01-in-docker.sh
- name: Upload
uses: actions/upload-artifact@v2
with:
name: Ubuntu ${{ matrix.version }} amd64
path: dist/*.deb path: dist/*.deb
archlinux: archlinux:

View File

@ -11,7 +11,8 @@ ifeq ($(DEB_HOST_ARCH), amd64)
MINGW_UTF8_OBJS = x86_64-w64-mingw32/utf8init.o i686-w64-mingw32/utf8init.o x86_64-w64-mingw32/utf8manifest.o i686-w64-mingw32/utf8manifest.o MINGW_UTF8_OBJS = x86_64-w64-mingw32/utf8init.o i686-w64-mingw32/utf8init.o x86_64-w64-mingw32/utf8manifest.o i686-w64-mingw32/utf8manifest.o
execute_after_dh_auto_build: $(MINGW_UTF8_OBJS) override_dh_auto_build: $(MINGW_UTF8_OBJS)
dh_auto_build -O--buildsystem qmake
x86_64-w64-mingw32/utf8init.o: platform/windows/utf8/utf8init.cpp x86_64-w64-mingw32/utf8init.o: platform/windows/utf8/utf8init.cpp
mkdir -p $(dir $@) mkdir -p $(dir $@)
@ -29,7 +30,8 @@ i686-w64-mingw32/utf8manifest.o: platform/windows/utf8/utf8manifest.rc
mkdir -p $(dir $@) mkdir -p $(dir $@)
i686-w64-mingw32-windres -O coff -o $@ $< i686-w64-mingw32-windres -O coff -o $@ $<
execute_after_dh_install: override_dh_auto_install:
dh_auto_install -O--buildsystem=qmake
dh_install debian/compiler_hint.lua usr/libexec/RedPandaCPP dh_install debian/compiler_hint.lua usr/libexec/RedPandaCPP
dh_install x86_64-w64-mingw32/* usr/libexec/RedPandaCPP/x86_64-w64-mingw32 dh_install x86_64-w64-mingw32/* usr/libexec/RedPandaCPP/x86_64-w64-mingw32
dh_install i686-w64-mingw32/* usr/libexec/RedPandaCPP/i686-w64-mingw32 dh_install i686-w64-mingw32/* usr/libexec/RedPandaCPP/i686-w64-mingw32