Upgrade to newer ubuntu, podman & drop appveyor (#167)

* Upgrade to newer ubuntu, podman & drop appveyor

* Minor bugfixes exposed by newer tools

Author: AndreRenaud

.github/workflows/build_and_test.yml

@@ -9,41 +9,30 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container:
-      image: docker://andredesigna/pdfgen:latest
 
     steps:
       - uses: actions/checkout@v6
       - name: Build Win32
-        run: |
-          make clean
-          make CC=/usr/lib/mxe/usr/bin/i686-w64-mingw32.static-gcc CLANG_FORMAT=clang-format-10
-          cp testprog testprog.exe
+        run: make podman-build-win32
       - name: Infer
-        run: make clean && infer run --no-progress-bar -- make CFLAGS="-g -Wall -pipe" LFLAGS="-lm"
+        run: make podman-infer
       - name: Build
-        run: make clean && make
-      - name: Update coverage statistics
-        shell: bash
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-        run: |
-          if [[ "${GITHUB_REF##*/}" == "master" ]] ; then
-            ./testprog
-            coveralls -i pdfgen.c
-          fi
+        run: make podman-build
       - name: Test
-        run: make clean && scan-build-10 --status-bugs make check CLANG_FORMAT=clang-format-10
+        run: make podman-test
       - name: Fuzz Test
-        run: make fuzz-check CLANG=clang-10 CLANG_FORMAT=clang-format-10 -j8
+        run: make podman-fuzz-check -j8
       - name: Docs
-        run: make docs
+        run: make podman-docs
       - name: Coverage
-        run: make clean && make coverage
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+          GITHUB_REF: ${{ github.ref }}
+        run: make podman-coverage
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: main-artifacts
+          name: pdfgen-main-artifacts
           path: |
             output.pdf
             pdfgen.h
@@ -76,10 +65,10 @@ jobs:
         cp testprog.exe testprog-32.exe
         testprog-32
         cp output.pdf output-win32.pdf
-    - name: Upload aritfacts
+    - name: Upload artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: win32-artifacts
+        name: pdfgen-win32-artifacts
         path: |
           output-win32.pdf
           output-win64.pdf

Dockerfile

@@ -1,17 +1,14 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && apt-get install -y dirmngr
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 86B72ED9 \
- && echo "deb http://mirror.mxe.cc/repos/apt xenial main" > /etc/apt/sources.list.d/mxeapt.list
 
-RUN dpkg --add-architecture i386
 RUN apt-get update && apt-get install --no-install-recommends -y \
 	ca-certificates \
-	clang-10 \
-	clang-format-10 \
-	clang-tools-10 \
+	clang \
+	clang-format \
+	clang-tools \
 	cloc \
 	colordiff \
 	cppcheck \
@@ -23,33 +20,29 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 	ghostscript \
 	git \
 	graphviz \
-	libtinfo5 \
-	llvm-10 \
+	libclang-rt-dev \
+	libtinfo6 \
+	llvm \
 	locales-all \
 	make \
-	mxe-i686-w64-mingw32.static-gcc \
+	mingw-w64 \
 	pdftk-java \
 	poppler-utils \
-	python2.7 \
+	python3 \
 	python3-pip \
 	python3-setuptools \
 	software-properties-common \
 	tzdata \
 	valgrind \
 	vim \
+	xxd \
 	xz-utils \
 	zbar-tools
 
-RUN python3 -m pip install cpp-coveralls
+RUN python3 -m pip install --break-system-packages cpp-coveralls
 
 # Install Infer
-RUN mkdir -p /opt && curl -L https://github.com/facebook/infer/releases/download/v1.0.0/infer-linux64-v1.0.0.tar.xz | tar -C /opt -x -J
-ENV PATH $PATH:/opt/infer-linux64-v1.0.0/bin/
-
-# Install acroread
-RUN apt-get install -y --no-install-recommends \
-	libgtk2.0-0:i386 \
-	libxml2:i386
-RUN curl -L -O http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.5.5/enu/AdbeRdr9.5.5-1_i486linux_enu.bin && chmod +x AdbeRdr9.5.5-1_i486linux_enu.bin && ./AdbeRdr9.5.5-1_i486linux_enu.bin --install_path=/opt
+RUN mkdir -p /opt && curl -L https://github.com/facebook/infer/releases/download/v1.2.0/infer-linux-x86_64-v1.2.0.tar.xz | tar -C /opt -x -J
+ENV PATH $PATH:/opt/infer-linux-x86_64-v1.2.0/bin/
 
 RUN apt-get clean

Makefile

@@ -44,7 +44,6 @@ check: $(TESTPROG) pdfgen.c pdfgen.h example-check
 	cppcheck --std=c99 --enable=style,warning,performance,portability,unusedFunction --quiet pdfgen.c pdfgen.h tests/main.c
 	$(CXX) -c pdfgen.c $(CFLAGS_OBJECT) /dev/null -Werror -Wall -Wextra
 	./tests/tests.sh
-	./tests/tests.sh acroread
 	$(CLANG_FORMAT) pdfgen.c | colordiff -u pdfgen.c -
 	$(CLANG_FORMAT) pdfgen.h | colordiff -u pdfgen.h -
 	$(CLANG_FORMAT) tests/main.c | colordiff -u tests/main.c -
@@ -56,26 +55,56 @@ coverage: $(TESTPROG)
 	mkdir coverage-html
 	gcovr -r . --html --html-details -o coverage-html/coverage.html
 
-example-check: FORCE
+example-check:
 	# Extract the code block from the README & make sure it compiles
 	sed -n '/^```/,/^```/ p' < README.md | sed '/^```/ d' > example-check.c
 	$(CC) $(CFLAGS) -o example-check example-check.c pdfgen.c $(LFLAGS)
 	rm example-check example-check.c
 
-check-fuzz-%: tests/fuzz-% FORCE
+check-fuzz-%: tests/fuzz-%
 	mkdir -p fuzz-artifacts
 	./$< -verbosity=0 -max_total_time=240 -max_len=8192 -rss_limit_mb=1024 -artifact_prefix="./fuzz-artifacts/"
 
 fuzz-check: check-fuzz-image-data check-fuzz-image-file check-fuzz-header check-fuzz-text check-fuzz-dstr check-fuzz-barcode check-fuzz-ttf
 
-format: FORCE
+format:
 	$(CLANG_FORMAT) -i pdfgen.c pdfgen.h tests/main.c tests/fuzz-*.c tests/massive-file.c
 
-docs: FORCE
+docs:
 	doxygen docs/pdfgen.dox 2>&1 | tee doxygen.log
 	cat doxygen.log | test `wc -c` -le 0
 
-FORCE:
+podman-image:
+	podman build -t pdfgen .
+
+podman-build-win32: podman-image
+	podman run --rm -v $(PWD):/src -w /src pdfgen bash -c 'make clean && make CC=x86_64-w64-mingw32-gcc'
+
+podman-infer: podman-image
+	podman run --rm -v $(PWD):/src -w /src pdfgen bash -c 'make clean && infer run --no-progress-bar -- make CFLAGS="-g -Wall -pipe" LFLAGS="-lm"'
+
+podman-build: podman-image
+	podman run --rm -v $(PWD):/src -w /src pdfgen bash -c 'make clean && make'
+
+podman-test: podman-image
+	podman run --rm -v $(PWD):/src -w /src pdfgen bash -c 'make clean && scan-build --status-bugs make check'
+
+podman-check: podman-image
+	podman run --rm -v $(PWD):/src -w /src pdfgen bash -c 'make clean && make check'
+
+podman-fuzz-check: podman-image
+	podman run --rm -v $(PWD):/src -w /src pdfgen bash -c 'make clean && make fuzz-check -j8'
+
+podman-docs: podman-image
+	podman run --rm -v $(PWD):/src -w /src pdfgen make docs
+
+podman-coverage: podman-image
+	podman run --rm -v $(PWD):/src -w /src -e COVERALLS_REPO_TOKEN=$(COVERALLS_REPO_TOKEN) -e GITHUB_REF=$(GITHUB_REF) pdfgen bash -c 'make clean && make coverage && if [ "$$(basename "$${GITHUB_REF:-none}")" = "master" ]; then ./testprog && coveralls -i pdfgen.c; fi'
+
+podman-shell: podman-image
+	podman run -i -t --rm -v $(PWD):/src -w /src pdfgen /bin/bash
+
+.PHONY: default check coverage example-check fuzz-check format docs podman-image podman-build-win32 podman-infer podman-build podman-test podman-check podman-fuzz-check podman-docs podman-coverage podman-shell clean
 
 clean:
 	rm -f *$(O_SUFFIX) tests/*$(O_SUFFIX) $(TESTPROG) *.gcda *.gcno *.gcov tests/*.gcda tests/*.gcno output.pdf output.txt tests/fuzz-header tests/fuzz-text tests/fuzz-image-data tests/fuzz-image-file test/massive-file output.pdftk fuzz-image-file.pdf fuzz-image-data.pdf fuzz-image.dat doxygen.log tests/penguin.c fuzz.pdf output.ps output.ppm output-barcodes.txt

README.md

@@ -62,8 +62,6 @@ Builds
 ======
 Build status: [![GitHub Actions](https://github.com/AndreRenaud/PDFGen/workflows/Build%20and%20Test/badge.svg)](https://github.com/AndreRenaud/PDFGen/actions)
 
-Appveyor status: [![Build status](https://ci.appveyor.com/api/projects/status/3qpsmr06xg5gx74j/branch/master?svg=true)](https://ci.appveyor.com/project/AndreRenaud/pdfgen/branch/master)
-
 Code Coverage: [![Coverage Status](https://coveralls.io/repos/github/AndreRenaud/PDFGen/badge.svg?branch=master)](https://coveralls.io/github/AndreRenaud/PDFGen?branch=master)
 
 Coverity scan: [![Coverity scan](https://scan.coverity.com/projects/11942/badge.svg)](https://scan.coverity.com/projects/andrerenaud-pdfgen)