Skip to content

Commit

Permalink
docs: Add DSP-META to docs (#137)
Browse files Browse the repository at this point in the history
  • Loading branch information
BalduinLandolt authored Sep 30, 2024
1 parent 461c6fc commit 3a06b1c
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 9 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@
[submodule "dsp/dsp-ingest"]
path = dsp/dsp-ingest
url = https://github.com/dasch-swiss/dsp-ingest
[submodule "dsp/dsp-meta"]
path = dsp/dsp-meta
url = https://github.com/dasch-swiss/dsp-meta
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ init-submodules: ## init the documentation from each connected repo; this comman

.PHONY: update-submodules
update-submodules: ## grab the current documentation from each connected repo
'$(CURRENT_DIR)/update-and-deploy.sh' dsp=$(DSP) api=$(API) app=$(APP) tools=$(TOOLS) ingest=$(INGEST) deploy=false
'$(CURRENT_DIR)/update-and-deploy.sh' dsp=$(DSP) api=$(API) app=$(APP) tools=$(TOOLS) ingest=$(INGEST) meta=$(META) deploy=false

.PHONY: openapi-update
openapi-update:
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ It includes these components:
- [DSP-APP](https://github.com/dasch-swiss/dsp-das)
- [DSP-TOOLS](https://github.com/dasch-swiss/dsp-tools)
- [DSP-INGEST](https://github.com/dasch-swiss/dsp-ingest)
- [DSP-META](https://github.com/dasch-swiss/dsp-meta)

## File structure

Expand Down
2 changes: 1 addition & 1 deletion dsp/dsp-api
Submodule dsp-api updated 23 files
+0 −1 build.sbt
+1 −1 docker-compose.yml
+4 −4 project/Dependencies.scala
+1 −6 webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala
+1 −0 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/gravsearch/getIncomingImageLinks.scala.txt
+1 −0 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/changeParentNode.scala.txt
+2 −0 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/checkListNodeExistsByName.scala.txt
+1 −0 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/deleteNode.scala.txt
+1 −0 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/deletePermission.scala.txt
+2 −0 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getFileValue.scala.txt
+1 −0 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectOfEntity.scala.txt
+1 −0 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateNodePosition.scala.txt
+1 −0 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updatePermission.scala.txt
+2 −0 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyGuiElement.scala.txt
+1 −0 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createProperty.scala.txt
+1 −0 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteClass.scala.txt
+1 −0 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteProperty.scala.txt
+2 −0 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteValue.scala.txt
+1 −0 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/eraseResource.scala.txt
+2 −0 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getAllOntologyMetadata.scala.txt
+1 −0 ...src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getAllResourcesInProjectPrequery.scala.txt
+1 −0 ...i/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourcePropertiesAndValues.scala.txt
+2 −0 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/isEntityUsed.scala.txt
2 changes: 1 addition & 1 deletion dsp/dsp-app
2 changes: 1 addition & 1 deletion dsp/dsp-ingest
1 change: 1 addition & 0 deletions dsp/dsp-meta
Submodule dsp-meta added at a98e2b
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ nav:
- DSP-API: "!include ./dsp/dsp-api/mkdocs.yml"
- DSP-TOOLS: "!include ./dsp/dsp-tools/mkdocs.yml"
- DSP-INGEST: "!include ./dsp/dsp-ingest/mkdocs.yml"
- DSP-META: "!include ./dsp/dsp-meta/mkdocs.yml"
- Developers:
- Getting Started: developers/getting-started.md
- Basics:
Expand Down Expand Up @@ -67,4 +68,3 @@ markdown_extensions:
custom_checkbox: true
- pymdownx.tabbed:
alternate_style: true

6 changes: 4 additions & 2 deletions release.mk
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# for DSP, API, APP, see https://github.com/dasch-swiss/ops-deploy/blob/main/versions/RELEASE.json
# for DSP, API, APP, Ingest, see https://github.com/dasch-swiss/ops-deploy/blob/main/versions/RELEASE.json
# for TOOLS, see https://github.com/dasch-swiss/dsp-tools/releases
# for META, see https://github.com/dasch-swiss/dsp-meta/releases (NB: tags start with 'dsp-meta-')
DSP := "2024.08.02"
API := "v30.18.4"
APP := "v11.18.2"
TOOLS := "fdf58b9b8b7b244f3a99cc3629ffdb4e7d02d612"
TOOLS := "v9.0.2"
INGEST := "v0.12.3"
META := "dsp-meta-v2.3.0"

3 changes: 2 additions & 1 deletion update-and-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ stop() {
}

usage() {
echo "usage: <command> dsp=[main version] api=[api version] app=[app version] tools=[tools version] ingest=[ingest version] deploy=[false]"
echo "usage: <command> dsp=[main version] api=[api version] app=[app version] tools=[tools version] ingest=[ingest version] meta=[meta version] deploy=[false]"
echo ${sep}
}

Expand All @@ -23,6 +23,7 @@ api=""
app=""
tools=""
ingest=""
meta=""

deploy=false

Expand Down
1 change: 1 addition & 0 deletions updated-versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ API := \"\(.value.api)\"
APP := \"\(.value.app)\"
TOOLS := \"$tools\"
INGEST := \"\(.value.ingest)\""
META := \"\(.value.meta)\"
EOF

getDeployReleases | jq 'to_entries[0]' | jq -r "$template"

0 comments on commit 3a06b1c

Please sign in to comment.