gnucash-docs maint: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Thu Aug 30 09:44:08 EDT 2018
discards https://github.com/Gnucash/gnucash-docs/commit/5d3e6dac (commit)
Updated via https://github.com/Gnucash/gnucash-docs/commit/94f1bc12 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/9b6b811d (commit)
via https://github.com/Gnucash/gnucash-docs/commit/3f2a8c29 (commit)
via https://github.com/Gnucash/gnucash-docs/commit/8ffc1515 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (https://github.com/Gnucash/gnucash-docs/commit/5d3e6dac)
\
N -- N -- N (https://github.com/Gnucash/gnucash-docs/commit/94f1bc12)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
commit 94f1bc12a3344224194cb6db1f331af6db1edc4e
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Aug 30 14:58:30 2018 +0200
Add travis continuous integration to docs
That way all PR's we receive will automatically be checked with xmllint.
This may simplify contribution for people not comfortable with build tools.
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..20e36fc
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,15 @@
+# Test
+sudo: required
+language: c++
+compiler: gcc
+env:
+ - BUILDENV=ubuntu-14.04 BUILDTYPE=autotools-make
+services:
+ - docker
+install:
+ - docker --version
+ - echo BUILDENV="$BUILDENV"
+ - docker build -f util/ci/${BUILDENV}-docker -t ${BUILDENV}-gnucashbuild util/ci
+script:
+ - echo BUILDTYPE="$BUILDTYPE"
+ - docker run -v "$(pwd)":/gnucash-docs:rw --env="BUILDTYPE=$BUILDTYPE" --rm ${BUILDENV}-gnucashbuild
diff --git a/util/ci/afterfailure b/util/ci/afterfailure
new file mode 100755
index 0000000..942f032
--- /dev/null
+++ b/util/ci/afterfailure
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [[ "$BUILDTYPE" == "cmake-make" ]] || [[ "$BUILDTYPE" == "cmake-ninja" ]]; then
+ echo "########################";
+ echo "##### LastTest.log #####";
+ echo "########################";
+ cat /build/Testing/Temporary/LastTest.log;
+else
+ if [[ "$BUILDTYPE" == "autotools-make" ]]; then
+ echo "##################################";
+ echo "##### See error output above #####";
+ echo "##################################";
+
+ echo "Unknown BUILDTYPE: \"$BUILDTYPE\", cannot create failure information.";
+fi
+# This script should fail so that the entire script will fail.
+exit 1;
diff --git a/util/ci/commonbuild b/util/ci/commonbuild
new file mode 100644
index 0000000..f5c1570
--- /dev/null
+++ b/util/ci/commonbuild
@@ -0,0 +1,22 @@
+#!/bin/bash -e
+
+mkdir -p "$HOME"/.local/share
+
+if [[ "$BUILDTYPE" == "autotools-make" ]]; then
+ cd gnucash-docs
+ ./autogen.sh
+ cd ..
+fi
+
+mkdir build
+cd build
+export TZ="America/Los_Angeles"
+
+if [[ "$BUILDTYPE" == "autotools-make" ]]; then
+ ../gnucash-docs/configure
+ make -j 4
+ make check || ../afterfailure
+else
+ echo "Unknown buildtype: \"$BUILDTYPE\". Not building."
+fi
+
diff --git a/util/ci/ubuntu-14.04-docker b/util/ci/ubuntu-14.04-docker
new file mode 100644
index 0000000..e1a8e1e
--- /dev/null
+++ b/util/ci/ubuntu-14.04-docker
@@ -0,0 +1,7 @@
+from ubuntu:14.04
+run apt-get update -qq
+run apt-get install -qq git bash-completion make xsltproc libxml2-utils autoconf libtool > /dev/null
+run apt-get --reinstall install -qq language-pack-en language-pack-fr
+copy ubuntu-14.04-testscript afterfailure commonbuild /
+run chmod +x /ubuntu-14.04-testscript /afterfailure /commonbuild
+entrypoint /ubuntu-14.04-testscript
diff --git a/util/ci/ubuntu-14.04-testscript b/util/ci/ubuntu-14.04-testscript
new file mode 100644
index 0000000..039784a
--- /dev/null
+++ b/util/ci/ubuntu-14.04-testscript
@@ -0,0 +1,6 @@
+#!/bin/bash -e
+
+# -e above so that if any command has an exit code != 0, this script will
+# exit immediately.
+
+../commonbuild
commit 9b6b811df1f1fb2cb5818bcaa824f3c7f8a852f0
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Sat May 12 21:56:07 2018 +0800
Document Filter/Closing transactions feature
diff --git a/help/C/Help_ch_Reports.xml b/help/C/Help_ch_Reports.xml
index 01847d5..7563af7 100644
--- a/help/C/Help_ch_Reports.xml
+++ b/help/C/Help_ch_Reports.xml
@@ -562,6 +562,17 @@
</tgroup>
</informaltable>
</listitem>
+ <listitem><para><guilabel>Closing transactions:</guilabel> One of</para>
+ <informaltable>
+ <tgroup cols="2">
+ <tbody>
+ <row><entry>Excluding closing transactions</entry><entry>Show only regular transactions</entry></row>
+ <row><entry>Show both closing and regular transactions</entry><entry>Show both regular and closing transactions</entry></row>
+ <row><entry>Show closing transactions only</entry><entry>Show closing transactions only</entry></row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ </listitem>
<listitem><para><guilabel>Reset defaults button:</guilabel> Reset all values to their defaults</para></listitem>
</itemizedlist>
</listitem>
commit 3f2a8c29abd5169d3af2eac3a325ff3f6c08e11e
Author: David T <sunfish62 at yahoo.com>
Date: Fri Aug 24 11:59:27 2018 -0400
Bug 791169 - Add Reconciliation definition to glossary
diff --git a/guide/C/gnc-glossary.xml b/guide/C/gnc-glossary.xml
index 3dedb0b..405174f 100644
--- a/guide/C/gnc-glossary.xml
+++ b/guide/C/gnc-glossary.xml
@@ -330,6 +330,18 @@
</glossdef>
</glossentry>
+<glossentry id="gnc-gl_reconciliation">
+ <glossterm>Reconciliation</glossterm>
+ <glossdef>
+ <para>Reconciliation is a verification process in which the user compares their records
+ with those of the financial institution to ensure that the records in each system agree
+ at some particular point in time. During reconciliation, the user checks individual
+ transactions in their file against the institution's statement; upon completion, the
+ reported balances of the institution and the reconciled account will match at that
+ point in the register.</para>
+ </glossdef>
+</glossentry>
+
<glossentry id="gnc-gl_return">
<glossterm>Return</glossterm>
<glossdef>
commit 8ffc1515cb0d5a6bc218fa6c6dd795d6bbc97d2f
Merge: 94744d9 f4a58ba
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Aug 30 15:39:17 2018 +0200
Merge branch 'maint-progress' of https://github.com/christopherlam/gnucash-docs into maint
Summary of changes:
.travis.yml | 15 +++++++++++++++
guide/C/gnc-glossary.xml | 12 ++++++++++++
help/C/Help_ch_Reports.xml | 11 +++++++++++
util/ci/afterfailure | 17 +++++++++++++++++
util/ci/commonbuild | 22 ++++++++++++++++++++++
util/ci/ubuntu-14.04-docker | 7 +++++++
util/ci/ubuntu-14.04-testscript | 6 ++++++
7 files changed, 90 insertions(+)
create mode 100644 .travis.yml
create mode 100755 util/ci/afterfailure
create mode 100644 util/ci/commonbuild
create mode 100644 util/ci/ubuntu-14.04-docker
create mode 100644 util/ci/ubuntu-14.04-testscript
More information about the gnucash-changes
mailing list