Skip to content

Update from template (auto-merged) #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jun 12, 2024
Merged

Update from template (auto-merged) #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3feccd2
Update dependency org.apache.maven.plugins:maven-checkstyle-plugin to…
xdev-renovate Jun 6, 2024
543132b
Merge pull request #66 from xdev-software/renovate/org.apache.maven.p…
AB-xdev Jun 10, 2024
544753b
Fix rev-parse not working
AB-xdev Jun 11, 2024
a042b63
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 11, 2024
49f82a1
Fix problem with fetch depth of 0
AB-xdev Jun 11, 2024
e73d714
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 11, 2024
1b8b6b2
Fully unshallow every as ls-remote also fails
AB-xdev Jun 11, 2024
de9071b
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 11, 2024
538caf1
Revert "Fully unshallow every as ls-remote also fails"
AB-xdev Jun 11, 2024
ca909f1
Revert "Fix problem with fetch depth of 0"
AB-xdev Jun 11, 2024
38e37eb
Revert "Fix rev-parse not working"
AB-xdev Jun 11, 2024
56ef08a
Correct if
AB-xdev Jun 11, 2024
f9d8378
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 11, 2024
d8cb83c
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/update-from-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion chartjs-java-model-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion chartjs-java-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down