Skip to content

Commit be0c609

Browse files
authored
Merge pull request #181 from xdev-software/update-from-template-merged
Update from template (auto-merged)
2 parents 2e84fc1 + d8cb83c commit be0c609

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

Diff for: .github/workflows/update-from-template.yml

+4
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,8 @@ jobs:
211211
echo "Checking if update-branch-merged exists"
212212
git fetch
213213
if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
214+
echo "Branch still exists; Continuing..."
215+
else
214216
echo "Branch origin/${{ env.UPDATE_BRANCH_MERGED }} is missing"
215217
exit 0
216218
fi
@@ -274,6 +276,8 @@ jobs:
274276
echo "Fetching..."
275277
git fetch
276278
if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
279+
echo "Branch still exists; Continuing..."
280+
else
277281
echo "Branch origin/${{ env.UPDATE_BRANCH_MERGED }} is missing"
278282
exit 0
279283
fi

Diff for: chartjs-java-model-demo/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<plugin>
8686
<groupId>org.apache.maven.plugins</groupId>
8787
<artifactId>maven-checkstyle-plugin</artifactId>
88-
<version>3.3.1</version>
88+
<version>3.4.0</version>
8989
<dependencies>
9090
<dependency>
9191
<groupId>com.puppycrawl.tools</groupId>

Diff for: chartjs-java-model/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@
355355
<plugin>
356356
<groupId>org.apache.maven.plugins</groupId>
357357
<artifactId>maven-checkstyle-plugin</artifactId>
358-
<version>3.3.1</version>
358+
<version>3.4.0</version>
359359
<dependencies>
360360
<dependency>
361361
<groupId>com.puppycrawl.tools</groupId>

Diff for: pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<plugin>
3737
<groupId>org.apache.maven.plugins</groupId>
3838
<artifactId>maven-checkstyle-plugin</artifactId>
39-
<version>3.3.1</version>
39+
<version>3.4.0</version>
4040
<configuration>
4141
<skip>true</skip>
4242
</configuration>

0 commit comments

Comments
 (0)