ci: use pkg-config for genbindings qscintilla/scintillaedit in ci

mappu · Oct 19, 2024 · 9fbb694 · 9fbb694
1 parent dfb53c3
commit 9fbb694
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/.github/workflows/miqt.yml b/.github/workflows/miqt.yml
@@ -15,7 +15,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Linux64 docker build
-      run: cd docker && docker build -t miqt/genbindings:latest -f genbindings.Dockerfile .
+      run: docker build -t miqt/genbindings:latest -f docker/genbindings.Dockerfile .
 
     - name: Cache clang ASTs
       uses: actions/cache@v4
@@ -37,7 +37,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: Linux64 docker build
-      run: cd docker && docker build -t miqt/linux64:latest -f linux64-go1.19-qt5.15-dynamic.Dockerfile .
+      run: docker build -t miqt/linux64:latest -f docker/linux64-go1.19-qt5.15-dynamic.Dockerfile .
 
     - name: Cache GOCACHE
       uses: actions/cache@v4
@@ -62,7 +62,7 @@ jobs:
         key: win64-gocache
 
     - name: Win64 docker build
-      run: cd docker && docker build -t miqt/win64:latest -f win64-cross-go1.23-qt5.15-static.Dockerfile .
+      run: docker build -t miqt/win64:latest -f docker/win64-cross-go1.23-qt5.15-static.Dockerfile .
 
     - name: Win64 bindings compile
       run: docker run -v ~/.cache/go-build:/root/.cache/go-build -v $PWD:/src -w /src miqt/win64:latest /bin/bash -c 'cd qt && go build'
diff --git a/docker/genbindings.Dockerfile b/docker/genbindings.Dockerfile
@@ -1,7 +1,16 @@
 FROM debian:bookworm
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
-    apt-get install -qyy golang-go qtbase5-dev libqscintilla2-qt5-dev clang git
+    apt-get install --no-install-recommends -qyy \
+        golang-go \
+        qtbase5-dev \
+        libqscintilla2-qt5-dev \
+        clang \
+        git \
+        ca-certificates \
+        pkg-config \
+        build-essential && \
+    apt-get clean
 
 RUN mkdir -p /usr/local/src/scintilla && \
     git clone 'https://github.com/mirror/scintilla.git' /usr/local/src/scintilla && \
@@ -15,3 +24,10 @@ RUN \
     python3 WidgetGen.py && \
     qmake && \
     make
+
+RUN mkdir -p /usr/local/lib/pkgconfig
+
+COPY pkg-config/QScintilla.pc.example /usr/local/lib/pkgconfig/QScintilla.pc
+COPY pkg-config/ScintillaEdit.pc.example /usr/local/lib/pkgconfig/ScintillaEdit.pc
+
+ENV GOFLAGS=-buildvcs=false