From 194a021da4e2ad8a8e700aff7b7547cd794fb078 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Mon, 9 Nov 2020 13:50:51 -0800 Subject: [PATCH 1/4] Use LTDL_LIBRARY_PATH instead of (DY)LD_LIBRARY_PATH With GnuCash's main libraries now linked at startup instead of being dlopened at runtime except by Guile we can restrict the library path renaming to Gnu Libtool's environment variable. --- gnucash/environment.in | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnucash/environment.in b/gnucash/environment.in index e81a013256..3c03b74ee9 100644 --- a/gnucash/environment.in +++ b/gnucash/environment.in @@ -64,10 +64,7 @@ GUILE_LOAD_PATH=@GNC_GUILE_LOAD_PATH@;{GUILE_LIBS};{GUILE_LOAD_PATH} GUILE_LOAD_COMPILED_PATH=@GNC_GUILE_LOAD_COMPILED_PATH@;{GUILE_COMPILED_LIBS};{GUILE_LOAD_COMPILED_PATH} # Tell Guile where to find GnuCash specific shared libraries -GNC_LIBRARY_PATH={SYS_LIB};{GNC_LIB} -LD_LIBRARY_PATH={GNC_LIBRARY_PATH};{LD_LIBRARY_PATH} -# The same, but for GnuCash on OS X -DYLD_LIBRARY_PATH={GNC_LIBRARY_PATH};{DYLD_LIBRARY_PATH} +LTDL_LIBRARY_PATH={SYS_LIB};{GNC_LIB} # For changing the language GnuCash uses, first refer to # to https://wiki.gnucash.org/wiki/Locale_Settings. From 08a0da8c4ef8825433f403fc7fbdfafed8424e58 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Mon, 9 Nov 2020 14:26:15 -0800 Subject: [PATCH 2/4] Fix typo in .gitattributes, text not test. --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 75ddd56bc6..15e143b3eb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -23,7 +23,7 @@ *.sh text eol=lf *.svg text eol=lf *.xsl text eol=lf -*.cmake test eol=lf +*.cmake text eol=lf Makefile.TAGS text eol=lf Makevars text eol=lf From b22bf07bc45263d7401d365d3568d2061433c065 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Mon, 9 Nov 2020 14:29:09 -0800 Subject: [PATCH 3/4] Setup Github Actions with CI testing for Ubuntu 18.04 --- .github/workflows/ci-tests.yml | 36 ++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/ci-tests.yml diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml new file mode 100644 index 0000000000..619679dd85 --- /dev/null +++ b/.github/workflows/ci-tests.yml @@ -0,0 +1,36 @@ +name: ci-tests +on: [push] +jobs: + ci_tests_ubuntu-18: + runs-on: ubuntu-18.04 + name: Ubuntu-18.04 Tests + env: + TZ: America/Los_Angeles + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Install additional dependencies + run: sudo apt-get install -y cmake libxslt-dev xsltproc ninja-build libboost-all-dev libgtk-3-dev guile-2.2-dev libgwengui-gtk3-dev libaqbanking-dev libofx-dev libdbi-dev libdbd-sqlite3 libwebkit2gtk-4.0-dev googletest + - name: Install language packs. + run: sudo apt-get --reinstall install -y language-pack-en language-pack-fr + - run: | + echo "ROOT_DIR=$GITHUB_WORKSPACE/.." >> $GITHUB_ENV + - name: Create Directories + run: | + pwd + mkdir $ROOT_DIR/inst + mkdir build + - name: Configure GnuCash + run: | + cd build + cmake -G Ninja -DWITH_PYTHON=ON -DCMAKE_INSTALL_PREFIX=$ROOT_DIR/inst $GITHUB_WORKSPACE + - name: Build and Test GnuCash + run: | + cd build + ninja + ninja check + - uses: actions/upload-artifact@v2 + if: failure() + with: + name: TestLog + path: ${{ github.workspace }}/build/Testing/Temporary/LastTest.log From 31c9c5e0805f9dd3f4435191134339f5b96dbdee Mon Sep 17 00:00:00 2001 From: John Ralls Date: Thu, 12 Nov 2020 13:53:59 -0800 Subject: [PATCH 4/4] Add Ubuntu-20 tests. --- .github/workflows/ci-tests.yml | 39 ++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 619679dd85..30ec9f3f67 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -34,3 +34,42 @@ jobs: with: name: TestLog path: ${{ github.workspace }}/build/Testing/Temporary/LastTest.log + ci_tests_ubuntu-20: + runs-on: ubuntu-20.04 + name: Ubuntu-20.04 Tests + env: + TZ: America/Los_Angeles + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Install apt utils + run: sudo apt-get install -y --no-install-recommends apt-utils + - name: Upgrade apt + run: | + 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-2.2-dev libgwengui-gtk3-dev libaqbanking-dev libofx-dev libdbi-dev libdbd-sqlite3 libwebkit2gtk-4.0-dev googletest + - name: Install language packs. + run: sudo apt-get --reinstall install -y language-pack-en language-pack-fr + - run: | + echo "ROOT_DIR=$GITHUB_WORKSPACE/.." >> $GITHUB_ENV + - name: Create Directories + run: | + pwd + mkdir $ROOT_DIR/inst + mkdir build + - name: Configure GnuCash + run: | + cd build + cmake -G Ninja -DWITH_PYTHON=ON -DCMAKE_INSTALL_PREFIX=$ROOT_DIR/inst $GITHUB_WORKSPACE + - name: Build and Test GnuCash + run: | + cd build + ninja + ninja check + - uses: actions/upload-artifact@v2 + if: failure() + with: + name: TestLog + path: ${{ github.workspace }}/build/Testing/Temporary/LastTest.log