From feb2aa218f967f425cf5433bcc347877f5bf13c0 Mon Sep 17 00:00:00 2001 From: Joshua Sangmeister <33004050+jsangmeister@users.noreply.github.com> Date: Wed, 24 Apr 2024 11:49:14 +0200 Subject: [PATCH] Fix & cleanup scripts (#6777) --- .github/workflows/test-integration.yml | 6 ------ dev/scripts/export-ds.sh | 3 +-- dev/scripts/set-ds.sh | 6 +----- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 552fd4e1df..27186570eb 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -12,12 +12,6 @@ jobs: with: submodules: recursive - - name: Build local openslides tool - working-directory: "./openslides-manage-service" - run: | - go build ./cmd/openslides - cp openslides ../dev/localprod/. - - name: Use example data instead of initial data working-directory: "./openslides-backend/global/data/" run: cp example-data.json initial-data.json diff --git a/dev/scripts/export-ds.sh b/dev/scripts/export-ds.sh index d9ef1cd03b..9eb82d82e4 100755 --- a/dev/scripts/export-ds.sh +++ b/dev/scripts/export-ds.sh @@ -4,5 +4,4 @@ set -e cd "$(dirname $0)" TARGET=${1:-export.json} -URL="http://localhost:9010/internal/datastore/reader/get_everything" -curl --header "Content-Type: application/json" -d '{}' $URL 2> /dev/null | python3 strip-meta-fields.py > $TARGET +docker compose -f ../docker/docker-compose.dev.yml exec -T datastore-writer python cli/export_data_only.py > "$TARGET" diff --git a/dev/scripts/set-ds.sh b/dev/scripts/set-ds.sh index 3f0eb5d171..611a2f8344 100755 --- a/dev/scripts/set-ds.sh +++ b/dev/scripts/set-ds.sh @@ -3,9 +3,5 @@ set -e cd "$(dirname $0)" -# first argument is the example data DATA=${1:-../../openslides-backend/global/data/example-data.json} -./clear-ds.sh -docker compose -f ../docker/docker-compose.dev.yml cp $DATA datastore-writer:/data.json -docker compose -f ../docker/docker-compose.dev.yml exec datastore-writer \ - bash -c "source export-database-variables.sh; export DATASTORE_INITIAL_DATA_FILE=/data.json; python cli/create_initial_data.py" +docker compose -f ../docker/docker-compose.dev.yml exec -T datastore-writer python cli/import_data_only.py < "$DATA"