From f2d29fc0ea918ed90df2c8ed42ad3222449ab054 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 13 Jan 2023 03:56:04 +0100 Subject: [PATCH] Remove duplicate automerge --- package.json | 1 - scripts/automerge-translations.sh | 18 ------------------ 2 files changed, 19 deletions(-) delete mode 100755 scripts/automerge-translations.sh diff --git a/package.json b/package.json index c74ca71687..1226363bb4 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,6 @@ "clean": "rm -rf .cache/ && (find *.html | grep -v \"^\\(404\\|index\\|land\\|test\\|preferences\\|customGenerator\\|professional\\|automaton\\|import_helper\\|import_viewer\\|theme\\).html\" | xargs rm) && (ls | grep \"^index_[a-zA-Z_-]\\+\\.ts$\" | xargs rm) && (ls | grep \".*.webmanifest$\" | grep -v \"manifest.webmanifest\" | xargs rm)", "generate:dependency-graph": "node_modules/.bin/depcruise --exclude \"^node_modules\" --output-type dot Logic/State/MapState.ts > dependencies.dot && dot dependencies.dot -T svg -o dependencies.svg && rm dependencies.dot", "script": "ts-node", - "weblate-merge": "./scripts/automerge-translations.sh", "weblate-add-upstream": "git remote add weblate-github git@github.com:weblate/MapComplete.git", "weblate-merge": "git remote update weblate-github; git merge weblate-github/weblate-mapcomplete-core weblate-github/weblate-mapcomplete-layers weblate-github/weblate-mapcomplete-layer-translations", "weblate-fix-heavy": "git remote rm weblate-layers; git remote add weblate-layers https://hosted.weblate.org/git/mapcomplete/layers/; git remote update weblate-layers; git merge weblate-layers/master", diff --git a/scripts/automerge-translations.sh b/scripts/automerge-translations.sh deleted file mode 100755 index 013efa5bf0..0000000000 --- a/scripts/automerge-translations.sh +++ /dev/null @@ -1,18 +0,0 @@ -#! /usr/bin/env bash - -# Automerge translations automatically fetches the translations from weblate - -git fetch weblate-github -git merge --no-commit weblate-github/weblate-mapcomplete-layers weblate-github/weblate-mapcomplete-layer-translations weblate-github/weblate-mapcomplete-core - -npm run generate:translations - if [ "$?" = "0" ]; then - # Translation generation went fine - commit - git add langs/ - git add assets/ - git commit -m "Merge weblate translations and regenerate translations" - git push - else - echo "Generation of translations failed!" - git merge --abort - fi