diff --git a/.gitmodules b/.gitmodules index ca42059..45c7d12 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,3 @@ path = src/archivematica-acceptance-tests url = https://github.com/artefactual-labs/archivematica-acceptance-tests branch = qa/1.x -[submodule "src/archivematica-devtools"] - path = src/archivematica-devtools - url = https://github.com/artefactual/archivematica-devtools diff --git a/compose/helpers/run-devtool.sh b/compose/helpers/run-devtool.sh deleted file mode 100755 index b434570..0000000 --- a/compose/helpers/run-devtool.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -set -o errexit -set -o pipefail -set -o nounset - -__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -__compose_dir="$(cd "$(dirname "${__dir}")" && pwd)" -__root_dir="$(cd "$(dirname "${__compose_dir}")" && pwd)" -__devtools_dir="${__root_dir}/src/archivematica-devtools" -__amworkflow_dir="${__root_dir}/src/archivematica-workflow" - -cd ${__compose_dir} - -TOOL=${1:-} - -if [ -z "$TOOL" ]; then - echo "Missing tool name, e.g. \"graph-links\"." - echo "List all the tools using the argument \"ls\"." - exit -elif [ "$TOOL" == "ls" ]; then - docker-compose run \ - --rm \ - --volume "${__devtools_dir}:/src/devtools" \ - -e "PYTHONPATH=/src/archivematicaCommon/lib:/src/dashboard/src" \ - --entrypoint bash \ - archivematica-dashboard -c "ls -l /src/devtools/tools" - exit -fi - -docker-compose run \ - --rm \ - --volume "${__devtools_dir}:/src/devtools" \ - --volume "${__amworkflow_dir}:/src/workflow" \ - -e "PYTHONPATH=/src/archivematicaCommon/lib:/src/dashboard/src" \ - --user=root \ - --entrypoint bash archivematica-dashboard - # --entrypoint /src/devtools/tools/$1 archivematica-dashboard "${@:2}" \ diff --git a/src/archivematica-acceptance-tests b/src/archivematica-acceptance-tests index 8850c49..5685f18 160000 --- a/src/archivematica-acceptance-tests +++ b/src/archivematica-acceptance-tests @@ -1 +1 @@ -Subproject commit 8850c490c2c20a40013866a24bf38415d2e0a6c4 +Subproject commit 5685f18fa20a8d31d177b558bc594f7b553348c8 diff --git a/src/archivematica-devtools b/src/archivematica-devtools deleted file mode 160000 index 9f842e0..0000000 --- a/src/archivematica-devtools +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9f842e00e4c8f952270af7c695caca5ed4d427a0