gnucash maint: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Fri Mar 12 19:42:35 EST 2021


Updated	 via  https://github.com/Gnucash/gnucash/commit/610391b7 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/28513f7b (commit)
	from  https://github.com/Gnucash/gnucash/commit/8e418570 (commit)



commit 610391b762a039cbba739c59955a40cc1825e1aa
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Mar 12 13:41:11 2021 -0800

    Fix Arch Linux CI
    
    It  was missing wayland-protocol and so not installing gtk3.

diff --git a/util/ci/actions/archlinux-test/Dockerfile b/util/ci/actions/archlinux-test/Dockerfile
index 24352b54f..6de5dff05 100644
--- a/util/ci/actions/archlinux-test/Dockerfile
+++ b/util/ci/actions/archlinux-test/Dockerfile
@@ -1,5 +1,5 @@
 from archlinux/base
-run pacman -Syu --quiet --noconfirm gcc cmake make boost python2 pkg-config gettext guile git ninja gtest gmock sqlite3 webkit2gtk swig gwenhywfar aqbanking intltool libxslt postgresql-libs libmariadbclient libdbi libdbi-drivers > /dev/null
+run pacman -Syu --quiet --noconfirm gcc cmake make boost python2 pkg-config gettext gtk3 guile git ninja gtest gmock sqlite3 webkit2gtk swig gwenhywfar aqbanking intltool libxslt postgresql-libs libmariadbclient libdbi libdbi-drivers wayland-protocols > /dev/null
 run echo en_US.UTF-8 UTF-8 >> /etc/locale.gen
 run echo en_GB.UTF-8 UTF-8 >> /etc/locale.gen
 run echo fr_FR.UTF-8 UTF-8 >> /etc/locale.gen

commit 28513f7bf7c3ee6fa20eb205b43705bd6dadd17b
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Mar 12 12:44:58 2021 -0800

    Fix Ubuntu 20.04 CI update

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index acf6c6834..ba3db1567 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -45,12 +45,14 @@ jobs:
       uses: actions/checkout at v2
     - name: Install apt utils
       run: sudo apt-get install -y --no-install-recommends apt-utils
-    - name: Upgrade apt
+    - name: Update apt
       run: |
+        sudo sed -i -e 's/^# deb-src/deb-src/' /etc/apt/sources.list
         sudo apt-get update -y
-        sudo apt-get upgrade -y
     - name: Install additional dependencies
-      run: sudo apt-get install -y cmake libxslt-dev xsltproc ninja-build libboost-all-dev libgtk-3-dev guile-3.0-dev libgwengui-gtk3-dev libaqbanking-dev libofx-dev libdbi-dev libdbd-sqlite3 libwebkit2gtk-4.0-dev  googletest
+      run: |
+           sudo apt-get build-dep -y gnucash
+           sudo apt-get install ninja-build guile-3.0-dev libboost-program-options-dev
     - name: Install language packs.
       run: sudo apt-get --reinstall install -y language-pack-en language-pack-fr
     - run: |



Summary of changes:
 .github/workflows/ci-tests.yml            | 8 +++++---
 util/ci/actions/archlinux-test/Dockerfile | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)



More information about the gnucash-changes mailing list