From 523b669f5d01a9ede1a31dd90a60b5078ceeaa43 Mon Sep 17 00:00:00 2001 From: Lisa Steinmann Date: Mon, 16 Dec 2024 13:28:14 +0100 Subject: [PATCH 1/6] run build only on 'master' or when build-keyword is used in commit msg --- .github/workflows/desktop.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index d0990ef2d4..a1744ccc1c 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -5,6 +5,8 @@ on: - "core/**" - "desktop/**" - ".github/workflows/desktop.yml" + branches: + - master pull_request: paths: - "core/**" @@ -51,6 +53,7 @@ jobs: working-directory: desktop Build: name: Build (${{ matrix.os.name }}) + if: ${{ (github.ref == 'refs/heads/master') || (contains(github.event.head_commit.message, 'build')) }} strategy: matrix: os: From 2315f7a363f9ded67aea0d6bbde8a28930dda8ba Mon Sep 17 00:00:00 2001 From: Lisa Steinmann Date: Mon, 16 Dec 2024 13:31:28 +0100 Subject: [PATCH 2/6] remove restriction to master in workflow conditions --- .github/workflows/desktop.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index a1744ccc1c..474920fe41 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -5,8 +5,6 @@ on: - "core/**" - "desktop/**" - ".github/workflows/desktop.yml" - branches: - - master pull_request: paths: - "core/**" From 1e64e632585b09ce3ca2d508b177a7c6dc453337 Mon Sep 17 00:00:00 2001 From: Lisa Steinmann Date: Mon, 16 Dec 2024 13:34:08 +0100 Subject: [PATCH 3/6] update readme - build --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 463dcb9c37..c24712bf40 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Manual](https://img.shields.io/badge/Manual-field.idai.world-green)](https://field.idai.world/manual) -Field is the German Archaeological Institutes take on digital field and find recording. For an overview of the genesis and the idea behind Field, check out one of our latest articles: +Field is the German Archaeological Institutes take on digital field and find recording for archaeological excavations. For an overview of the genesis and the idea behind Field, check out one of our latest articles: S. Hohl – T. Kleinke – F. Riebschläger – J. Watson, **iDAI.field: developing software for the documentation of archaeological fieldwork**, AeC 34, 1, 2023, 85–94, doi: [10.19282/ac.34.1.2023.10](https://doi.org/10.19282/ac.34.1.2023.10). From 7533d5c9d9d12b2b70512aa626bd77af96386e9a Mon Sep 17 00:00:00 2001 From: Lisa Steinmann Date: Mon, 16 Dec 2024 13:38:22 +0100 Subject: [PATCH 4/6] update readme in desktop to test the build keyword --- desktop/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/README.md b/desktop/README.md index c3b8e31fbb..a57995a566 100644 --- a/desktop/README.md +++ b/desktop/README.md @@ -1,6 +1,6 @@ # Field Desktop - -The German Archaeological Institute’s ([DAI](https://www.dainst.org)) new take on a field research documentation system. + +Field Desktop is the German Archaeological Institutes ([DAI](https://www.dainst.org)) take on digital field and find recording for archaeological excavations. ## Usage From d372b8353da4c053928f68dae4b3e2290a1a646a Mon Sep 17 00:00:00 2001 From: Lisa Steinmann Date: Mon, 16 Dec 2024 13:47:13 +0100 Subject: [PATCH 5/6] change build-keyword to use brackets --- .github/workflows/desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index 474920fe41..08cbee0c33 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -51,7 +51,7 @@ jobs: working-directory: desktop Build: name: Build (${{ matrix.os.name }}) - if: ${{ (github.ref == 'refs/heads/master') || (contains(github.event.head_commit.message, 'build')) }} + if: ${{ (github.ref == 'refs/heads/master') || (contains(github.event.head_commit.message, '[build]')) }} strategy: matrix: os: From 217c5539f23ddb80420d18a57ec456bad48cd044 Mon Sep 17 00:00:00 2001 From: Lisa Steinmann Date: Mon, 16 Dec 2024 14:09:08 +0100 Subject: [PATCH 6/6] update readmes to include GBV / VZG --- README.md | 4 +++- desktop/README.md | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c24712bf40..dcaa314433 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,9 @@ [![Manual](https://img.shields.io/badge/Manual-field.idai.world-green)](https://field.idai.world/manual) -Field is the German Archaeological Institutes take on digital field and find recording for archaeological excavations. For an overview of the genesis and the idea behind Field, check out one of our latest articles: +Field is a modern take on flexible field and find recording for archaeological excavations. It is developed as a cooperation between the German Archaeological Institute ([DAI](https://www.dainst.org)) and the Head Office of the GBV Common Library Network ([GBV](https://en.gbv.de/)). Field is completely Open Source and free to use! + +For an overview of the genesis and the idea behind Field, check out one of our latest articles: S. Hohl – T. Kleinke – F. Riebschläger – J. Watson, **iDAI.field: developing software for the documentation of archaeological fieldwork**, AeC 34, 1, 2023, 85–94, doi: [10.19282/ac.34.1.2023.10](https://doi.org/10.19282/ac.34.1.2023.10). diff --git a/desktop/README.md b/desktop/README.md index a57995a566..ef25f730e6 100644 --- a/desktop/README.md +++ b/desktop/README.md @@ -1,6 +1,6 @@ # Field Desktop -Field Desktop is the German Archaeological Institutes ([DAI](https://www.dainst.org)) take on digital field and find recording for archaeological excavations. +Field Desktop is a modern take on flexible field and find recording for archaeological excavations. It is developed as a cooperation between the German Archaeological Institute ([DAI](https://www.dainst.org)) and the Head Office of the GBV Common Library Network ([GBV](https://en.gbv.de/)). Field Desktop is completely Open Source and free to use! ## Usage