From e3aac9d3c29c62326a4a4aba90471e694b572b52 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Fri, 15 Dec 2023 11:58:23 -0500 Subject: [PATCH 1/4] Alter tei:descOrGlossOutOfDate() so that it will compare multiple elements; also test the desc or gloss elements based on type attribute --- common/functions.xsl | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/common/functions.xsl b/common/functions.xsl index d23c982db..fff4c88f7 100644 --- a/common/functions.xsl +++ b/common/functions.xsl @@ -1124,11 +1124,11 @@ of this software, even if advised of the possibility of such damage. @@ -1234,13 +1234,27 @@ of this software, even if advised of the possibility of such damage. - - - - + + + + + + + + + + + + + + + + + From aca9d4e317c5059e5e4a62dbc093fa9a10b0062e Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Thu, 4 Jan 2024 14:29:24 -0500 Subject: [PATCH 2/4] =?UTF-8?q?Oops=20=E2=80=94=20fix=20code=20to=20match?= =?UTF-8?q?=20comment:=20Test=20only=20those=20s=20and=20s=20?= =?UTF-8?q?that=20actually=20do=20not=20have=20a=20type=3D=20attribute.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/functions.xsl | 8 ++++---- debian-tei-xsl/debian/changelog | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/common/functions.xsl b/common/functions.xsl index fff4c88f7..5b2a83ab7 100644 --- a/common/functions.xsl +++ b/common/functions.xsl @@ -1237,11 +1237,11 @@ of this software, even if advised of the possibility of such damage. - + - + + - + gt $context/tei:gloss[ not(@type) ][ @xml:lang eq $lang ]/@versionDate"/> + + gt $context/tei:desc[ not(@type) ][ @xml:lang eq $lang ]/@versionDate"/> + gt $context/tei:gloss[ @type eq . ][ @xml:lang eq $lang ]/@versionDate"/> - + + gt $context/tei:desc[ @type eq . ][ @xml:lang eq $lang ]/@versionDate"/> From fcb9cbf4c4a80d477be7d1e22f7df0eeda9d081c Mon Sep 17 00:00:00 2001 From: Joey Takeda Date: Thu, 25 Jan 2024 13:44:12 -0800 Subject: [PATCH 4/4] Clean up CI files per #620 (#655) * Removes .travis.yml * Removes Slack notification from GH Actions jobs Co-authored-by: Syd Bauman --- .github/workflows/test.yml | 17 +---------------- .travis.yml | 12 ------------ 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f39fb3221..132c30009 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,14 +22,6 @@ jobs: - name: Run tests from the Test directory run: make clean test deb dist - - name: Slack Notification - if: always() - uses: rtCamp/action-slack-notify@v2 - env: - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - SLACK_COLOR: ${{ job.status }} - MSG_MINIMAL: commit,actions url - test2: runs-on: ubuntu-latest container: @@ -41,11 +33,4 @@ jobs: - name: Run tests from the Test2 directory run: make test2 - - - name: Slack Notification - if: always() - uses: rtCamp/action-slack-notify@v2 - env: - SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - SLACK_COLOR: ${{ job.status }} - MSG_MINIMAL: commit,actions url + \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ec465827d..000000000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -sudo: required - -language: java - -services: - - docker - -before_install: - - docker pull teic/jenkins:dev - -script: - - docker run --rm --name jenkins -w /var/odd -it -v `pwd`:/var/odd -u $UID --entrypoint "make" teic/jenkins:dev clean test deb dist