Skip to content
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

chore: combine renovate upgrades #845

Merged
merged 6 commits into from
Jul 19, 2022
Merged

chore: combine renovate upgrades #845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9cdcb60
chore(deps): update dependency com.diffplug.spotless:spotless-maven-p…
renovate[bot] Jul 1, 2022
dd35d46
chore(deps): update dependency org.apache.maven.plugins:maven-assembl…
renovate[bot] Jul 7, 2022
d859a38
chore(deps): update actions/setup-java action to v3.4.1
renovate[bot] Jul 11, 2022
184b607
chore(deps): update actions/setup-python action to v4.1.0
renovate[bot] Jul 11, 2022
f04e756
chore(deps): update actions/cache action to v3.0.5
renovate[bot] Jul 13, 2022
c2f1e3f
Merge branches 'renovate/actions-cache-3.x', 'renovate/actions-setup-…
invalid-email-address Jul 19, 2022
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: 2 additions & 2 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3.0.2

- name: Setup for Java build
uses: actions/setup-java@16cca5479d7c6b6843f6a6515640ba33c6501543 # tag=v3.4.0
uses: actions/setup-java@2c7a4878f5d120bd643426d54ae1209b29cc01a3 # tag=v3.4.1
with:
java-version: 11
java-package: jdk
Expand All @@ -44,7 +44,7 @@ jobs:
echo "::set-output name=version::$VERSION"

- name: Setup Java for deploy
uses: actions/setup-java@16cca5479d7c6b6843f6a6515640ba33c6501543 # tag=v3.4.0
uses: actions/setup-java@2c7a4878f5d120bd643426d54ae1209b29cc01a3 # tag=v3.4.1
with: # running setup-java again overwrites the settings.xml
java-version: 11
java-package: jdk
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/support.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3.0.2
with:
fetch-depth: 2
- uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb # tag=v4.0.0
- uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08 # tag=v4.1.0
with:
python-version: 3.8
- name: Install support scripts
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
--gh-repository ${{ github.repository }} \
--gh-workflow ${{ github.workflow }}

- uses: actions/setup-java@16cca5479d7c6b6843f6a6515640ba33c6501543 # tag=v3.4.0
- uses: actions/setup-java@2c7a4878f5d120bd643426d54ae1209b29cc01a3 # tag=v3.4.1
with:
java-version: 11
java-package: jdk
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3.0.2
with:
fetch-depth: 0 # SonarCloud prefers non-shallow clones
- uses: actions/setup-java@16cca5479d7c6b6843f6a6515640ba33c6501543 # tag=v3.4.0
- uses: actions/setup-java@2c7a4878f5d120bd643426d54ae1209b29cc01a3 # tag=v3.4.1
with:
java-version: 11
java-package: jdk
Expand All @@ -43,13 +43,13 @@ jobs:
run: echo "::set-output name=date::$(/bin/date -u "+%Y%m%d")"
shell: bash
- name: Use Maven dependency cache
uses: actions/cache@c3f1317a9e7b1ef106c153ac8c0f00fed3ddbc0d # tag=v3.0.4
uses: actions/cache@0865c47f36e68161719c5b124609996bb5c40129 # tag=v3.0.5
with:
path: ~/.m2/repository
key: ${{ runner.os }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-maven-
- name: Use SonarCloud package cache
uses: actions/cache@c3f1317a9e7b1ef106c153ac8c0f00fed3ddbc0d # tag=v3.0.4
uses: actions/cache@0865c47f36e68161719c5b124609996bb5c40129 # tag=v3.0.5
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
Expand Down Expand Up @@ -85,10 +85,10 @@ jobs:

steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3.0.2
- uses: actions/setup-python@d09bd5e6005b175076f227b13d9730d56e9dcfcb # tag=v4.0.0
- uses: actions/setup-python@c4e89fac7e8767b327bbad6cb4d859eda999cf08 # tag=v4.1.0
with:
python-version: 3.8
- uses: actions/setup-java@16cca5479d7c6b6843f6a6515640ba33c6501543 # tag=v3.4.0
- uses: actions/setup-java@2c7a4878f5d120bd643426d54ae1209b29cc01a3 # tag=v3.4.1
with:
java-version: 11
java-package: jdk
Expand All @@ -100,7 +100,7 @@ jobs:
run: echo "::set-output name=date::$(/bin/date -u "+%Y%m%d")"
shell: bash
- name: Use Maven dependency cache
uses: actions/cache@c3f1317a9e7b1ef106c153ac8c0f00fed3ddbc0d # tag=v3.0.4
uses: actions/cache@0865c47f36e68161719c5b124609996bb5c40129 # tag=v3.0.5
with:
path: ~/.m2/repository
key: ${{ runner.os }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('**/pom.xml') }}
Expand All @@ -120,7 +120,7 @@ jobs:

steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3.0.2
- uses: actions/setup-java@16cca5479d7c6b6843f6a6515640ba33c6501543 # tag=v3.4.0
- uses: actions/setup-java@2c7a4878f5d120bd643426d54ae1209b29cc01a3 # tag=v3.4.1
with:
java-version: 11
java-package: jdk
Expand All @@ -132,7 +132,7 @@ jobs:
run: echo "::set-output name=date::$(/bin/date -u "+%Y%m%d")"
shell: bash
- name: Use Maven dependency cache
uses: actions/cache@c3f1317a9e7b1ef106c153ac8c0f00fed3ddbc0d # tag=v3.0.4
uses: actions/cache@0865c47f36e68161719c5b124609996bb5c40129 # tag=v3.0.5
with:
path: ~/.m2/repository
key: ${{ runner.os }}-${{ steps.get-date.outputs.date }}-${{ hashFiles('**/pom.xml') }}
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 @@ -175,7 +175,7 @@
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.22.8</version>
<version>2.23.0</version>
<configuration>
<java>
<includes>
Expand Down
4 changes: 2 additions & 2 deletions sorald-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.1</version>
<configuration>
<archive>
<manifest>
Expand Down Expand Up @@ -197,7 +197,7 @@
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.22.8</version>
<version>2.23.0</version>
<configuration>
<java>
<includes>
Expand Down
4 changes: 2 additions & 2 deletions sorald/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.1</version>
<configuration>
<archive>
<manifest>
Expand Down Expand Up @@ -218,7 +218,7 @@
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.22.8</version>
<version>2.23.0</version>
<configuration>
<java>
<includes>
Expand Down