From 777d0806a4549f7abe353f47befe7908b84da3db Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 18 May 2026 19:41:29 +0200 Subject: [PATCH] .github: use action "ubuntu-install-pkg" for all builds on Ubuntu Signed-off-by: Enrico Weigelt, metux IT consult --- .github/scripts/ubuntu/install-pkg.sh | 2 ++ .github/workflows/build-xserver.yml | 24 ++++-------------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/.github/scripts/ubuntu/install-pkg.sh b/.github/scripts/ubuntu/install-pkg.sh index e4144d40c..ed4ec7653 100755 --- a/.github/scripts/ubuntu/install-pkg.sh +++ b/.github/scripts/ubuntu/install-pkg.sh @@ -97,3 +97,5 @@ apt-get install -y \ git \ sudo +# only pull them into apt cache -- for mingw32 build +apt-get install -d -y mingw-w64-tools gcc-mingw-w64 gcc-mingw-w64-i686 libz-mingw-w64-dev diff --git a/.github/workflows/build-xserver.yml b/.github/workflows/build-xserver.yml index feafac514..fd1dc6d46 100644 --- a/.github/workflows/build-xserver.yml +++ b/.github/workflows/build-xserver.yml @@ -61,22 +61,14 @@ jobs: - name: Check out repository code uses: actions/checkout@v6 + - uses: ./.github/actions/ubuntu-install-pkg + - name: prepare build environment run: | MACHINE=`gcc -dumpmachine` echo "MACHINE=$MACHINE" >> "$GITHUB_ENV" echo "PKG_CONFIG_PATH=$X11_PREFIX/share/pkgconfig:$X11_PREFIX/lib/$MACHINE/pkgconfig:$X11_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" >> "$GITHUB_ENV" - - name: apt cache - uses: actions/cache@v4 - with: - path: /var/cache/apt - key: apt-cache-${{ hashFiles('.github/scripts/ubuntu/install-pkg.sh') }} - restore-keys: apt-cache- - - - name: pkg install - run: sudo .github/scripts/ubuntu/install-pkg.sh - - name: X11 prereq cache uses: actions/cache@v4 with: @@ -101,22 +93,14 @@ jobs: - name: Check out repository code uses: actions/checkout@v6 + - uses: ./.github/actions/ubuntu-install-pkg + - name: prepare build environment run: | MACHINE=`gcc -dumpmachine` echo "MACHINE=$MACHINE" >> "$GITHUB_ENV" echo "PKG_CONFIG_PATH=$X11_PREFIX/share/pkgconfig:$X11_PREFIX/lib/$MACHINE/pkgconfig:$X11_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" >> "$GITHUB_ENV" - - name: apt cache - uses: actions/cache@v4 - with: - path: /var/cache/apt - key: apt-cache-${{ hashFiles('.github/scripts/ubuntu/install-pkg.sh') }} - restore-keys: apt-cache- - - - name: pkg install - run: sudo .github/scripts/ubuntu/install-pkg.sh - - name: X11 prereq cache uses: actions/cache@v4 with: