From 9c2435a327ccf67a1d9a84228a2c67686234f4b5 Mon Sep 17 00:00:00 2001
From: Bogdan Kobylynskyi <92bogdan@gmail.com>
Date: Fri, 5 Mar 2021 00:57:09 -0500
Subject: [PATCH] Update workflows

---
 .github/workflows/release.yml                               | 6 ++++--
 .github/workflows/update-version.yml                        | 1 +
 .../{ => graphql-java-codegen-maven-plugin}/.maven.xml      | 5 ++---
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename plugins/maven/{ => graphql-java-codegen-maven-plugin}/.maven.xml (79%)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 110bb0a9..25e20f30 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -189,7 +189,7 @@ jobs:
         working-directory: plugins/maven/graphql-java-codegen-maven-plugin
         run: |
           mvn \
-            --settings .maven.xml
+            --settings .maven.xml \
             --no-transfer-progress \
             --batch-mode \
             -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} \
@@ -212,4 +212,6 @@ jobs:
       #
 
       - name: Push release version
-        run: git push --tags
\ No newline at end of file
+        run: |
+          git push
+          git push --tags
\ No newline at end of file
diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
index de601ae9..4b8a8fec 100644
--- a/.github/workflows/update-version.yml
+++ b/.github/workflows/update-version.yml
@@ -33,4 +33,5 @@ jobs:
           git config --global user.name 'Bogdan Kobylynskyi'
           git config --global user.email 'kobylynskyi@users.noreply.github.com'
           git commit -am "Bump version to ${{ github.event.inputs.new_version }}"
+          git push
           git push --tags
diff --git a/plugins/maven/.maven.xml b/plugins/maven/graphql-java-codegen-maven-plugin/.maven.xml
similarity index 79%
rename from plugins/maven/.maven.xml
rename to plugins/maven/graphql-java-codegen-maven-plugin/.maven.xml
index 60dda0a5..e1b46b95 100644
--- a/plugins/maven/.maven.xml
+++ b/plugins/maven/graphql-java-codegen-maven-plugin/.maven.xml
@@ -1,6 +1,5 @@
-<settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xsi:schemalocation="http://maven.apache.org/SETTINGS/1.0.0
+<settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
                       http://maven.apache.org/xsd/settings-1.0.0.xsd">
     <servers>
         <!-- Maven Central deployment -->
-- 
GitLab