From 5bc9ef60481107efa9f04d6aa0138fa65b3bfe99 Mon Sep 17 00:00:00 2001 From: David Otterdahl Date: Thu, 29 Feb 2024 22:31:23 +0100 Subject: [PATCH] Fix workflow --- .github/patches/gd.diff | 11 +++++++++++ .github/workflows/gh-pages.yml | 28 +++++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 .github/patches/gd.diff diff --git a/.github/patches/gd.diff b/.github/patches/gd.diff new file mode 100644 index 0000000..4261876 --- /dev/null +++ b/.github/patches/gd.diff @@ -0,0 +1,11 @@ +--- a/src/gd_out.c 2011-03-05 11:51:50.000000000 +0100 ++++ b/src/gd_out.c 2021-02-23 15:23:00.434133429 +0100 +@@ -212,6 +212,6 @@ + * the right of the last character for the fixed width + * font. + */ +- return rect[2] - 1; ++ return rect[2] ? rect[2] - 1 : 0; + #endif + } + diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 7e51a66..eb6c821 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -10,7 +10,7 @@ on: jobs: build-sxl-tlc: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Check out rsmp_sxl_traffic_lights repository (gh-pages) uses: actions/checkout@v4 @@ -35,8 +35,30 @@ jobs: imagemagick \ inkscape \ librsvg2-bin \ - latexmk \ - mscgen + latexmk + - name: Install dependencies for mscgen + run: | + sudo apt-get remove nginx + sudo apt-get remove libgd3 + sudo apt-get -y install autoconf flex bison gcc make pkg-config libgd-dev + - name: Clone mscgen + run: git clone https://github.com/dok-net/mscgen.git + - name: Fetch patch for mscgen (fixes issue under Ubuntu 20.04) + run: | + cp .github/patches/gd.diff mscgen + cd mscgen + patch -p1