Merge pull request #181 from xdev-software/update-from-template-merged

Update from template (auto-merged)
xdev-software · Jun 12, 2024 · be0c609 · be0c609
2 parents 2e84fc1 + d8cb83c
commit be0c609
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml
@@ -211,6 +211,8 @@ jobs:
             echo "Checking if update-branch-merged exists"
             git fetch
             if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
+              echo "Branch still exists; Continuing..."
+            else
               echo "Branch origin/${{ env.UPDATE_BRANCH_MERGED }} is missing"
               exit 0
             fi
@@ -274,6 +276,8 @@ jobs:
           echo "Fetching..."
           git fetch
           if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
+            echo "Branch still exists; Continuing..."
+          else
             echo "Branch origin/${{ env.UPDATE_BRANCH_MERGED }} is missing"
             exit 0
           fi

diff --git a/chartjs-java-model-demo/pom.xml b/chartjs-java-model-demo/pom.xml
@@ -85,7 +85,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-checkstyle-plugin</artifactId>
-						<version>3.3.1</version>
+						<version>3.4.0</version>
 						<dependencies>
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>

diff --git a/chartjs-java-model/pom.xml b/chartjs-java-model/pom.xml
@@ -355,7 +355,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-checkstyle-plugin</artifactId>
-						<version>3.3.1</version>
+						<version>3.4.0</version>
 						<dependencies>
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>

diff --git a/pom.xml b/pom.xml
@@ -36,7 +36,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-checkstyle-plugin</artifactId>
-						<version>3.3.1</version>
+						<version>3.4.0</version>
 						<configuration>
 							<skip>true</skip>
 						</configuration>