Test #8

.gitlab-ci.yml

@@ -1,9 +1,10 @@
-image: amazoncorretto:21
+image: amazoncorretto:21-alpine
 
 before_script:
   - export GRADLE_USER_HOME=`pwd`/.gradle
 
 stages:
+  - merge
   - build
   - deploy
 
@@ -64,3 +65,30 @@ deploy:
       - ./*.jar
 #      - neoforge/build/libs/*+*.jar
 #      - fabric/build/libs/*+*.jar
+
+merge_on_lang_change:
+  stage: merge
+  script:
+    # Check for changes in the specified file or directory
+    - |
+      apk add git
+      if git diff --name-only "$CI_COMMIT_BEFORE_SHA" "$CI_COMMIT_SHA" | grep -q "common/src/main/resources/assets/cobblemon/lang/en_us.json"; then
+        echo "US locale changed! Updating lang branch..."
+      
+        # Configure Git user for the merge commit
+        git config --global user.email "noreply@weblate.org"
+        git config --global user.name "Weblate"
+        git remote set-url origin https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/cable-mc/cobblemon.git
+      
+        # Fetch the target branch and merge main into it
+        git fetch origin lang-updates
+        git checkout lang-updates
+        git merge origin/ci-test
+      
+        # Push the merged branch back to the repository
+        git push origin lang-updates:lang-updates-test
+      else
+        echo "No need to update lang"
+      fi
+  only:
+    - ci-test

common/src/main/resources/assets/cobblemon/lang/en_us.json

@@ -6527,5 +6527,5 @@
   "cobblemon.ability.zenmode": "Zen Mode",
   "cobblemon.ability.zenmode.desc": "Changes the Pokémon's shape when HP is half or less.",
   "cobblemon.ability.zerotohero": "Zero to Hero",
-  "cobblemon.ability.zerotohero.desc": "The Pokémon transforms into its Hero Form when it switches out."
+  "cobblemon.ability.zerotohero.desc": "The Pokémon transforms into its Hero Form when it switches out. TEST AGAIN AGAIN AGAIN AGAIN AGAIN AGAIN AGAIN"
 }