Skip to content

Commit aab7a03

Browse files
author
Vincent Potucek
committed
Add SanityCheck#EqualityRulesRecipes
Signed-off-by: Vincent Potucek <vpotucek@me.com>
1 parent 927b2ee commit aab7a03

File tree

82 files changed

+217
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+217
-135
lines changed

‎.github/actions/build/action.yml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build
1+
name: Build 📦
22
description: 'Builds the project, optionally publishing it to a local deployment repository'
33
inputs:
44
commercial-release-repository-url:
@@ -50,7 +50,7 @@ outputs:
5050
runs:
5151
using: composite
5252
steps:
53-
- name: Prepare Gradle Build
53+
- name: Prepare Gradle Build ⚙️
5454
uses: ./.github/actions/prepare-gradle-build
5555
with:
5656
cache-read-only: ${{ inputs.gradle-cache-read-only }}
@@ -59,7 +59,7 @@ runs:
5959
java-early-access: ${{ inputs.java-early-access }}
6060
java-toolchain: ${{ inputs.java-toolchain }}
6161
java-version: ${{ inputs.java-version }}
62-
- name: Build
62+
- name: Build 📦
6363
id: build
6464
if: ${{ inputs.publish == 'false' }}
6565
shell: bash
@@ -69,7 +69,17 @@ runs:
6969
COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }}
7070
COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }}
7171
run: ./gradlew build
72-
- name: Publish
72+
- name: Sanity Check 🦢
73+
id: sanity
74+
if: ${{ inputs.publish == 'false' }}
75+
shell: bash
76+
env:
77+
COMMERCIAL_RELEASE_REPO_URL: ${{ inputs.commercial-release-repository-url }}
78+
COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }}
79+
COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }}
80+
COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }}
81+
run: ./gradlew rewriteDryRun -Dorg.gradle.jvmargs=-Xmx12G
82+
- name: Publish 📡
7383
id: publish
7484
if: ${{ inputs.publish == 'true' }}
7585
shell: bash

‎.github/workflows/build-and-deploy-snapshot.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
if: ${{ github.repository == 'spring-projects/spring-boot' || github.repository == 'spring-projects/spring-boot-commercial' }}
1515
runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
1616
steps:
17-
- name: Check Out Code
17+
- name: Checkout Code 📥
1818
uses: actions/checkout@v6
19-
- name: Build and Publish
19+
- name: Build 📦 and Publish 📡
2020
id: build-and-publish
2121
uses: ./.github/actions/build
2222
with:

‎.github/workflows/build-pull-request.yml‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
1-
name: Build Pull Request
1+
name: Build Pull Request 🏭️
22
on: pull_request
33
permissions:
44
contents: read
55
jobs:
66
build:
7-
name: Build Pull Request
8-
if: ${{ github.repository == 'spring-projects/spring-boot' }}
7+
name: Build 📦
8+
# if: ${{ github.repository == 'spring-projects/spring-boot' }}
99
runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
1010
steps:
11-
- name: Check Out Code
11+
- name: Checkout Code 📥
1212
uses: actions/checkout@v6
13-
- name: Build
13+
- name: Build 📦
1414
id: build
1515
uses: ./.github/actions/build
16-
- name: Print JVM Thread Dumps When Cancelled
17-
if: cancelled()
18-
uses: ./.github/actions/print-jvm-thread-dumps
19-
- name: Upload Build Reports
20-
if: failure()
21-
uses: actions/upload-artifact@v6
22-
with:
23-
name: build-reports
24-
path: '**/build/reports/'
16+
# - name: Log Potentially Canceled JVM Thread Dumps 📋
17+
# if: cancelled()
18+
# uses: ./.github/actions/print-jvm-thread-dumps
19+
# - name: Upload Build Report 📊
20+
# if: failure()
21+
# uses: actions/upload-artifact@v6
22+
# with:
23+
# name: build-reports
24+
# path: '**/build/reports/'
25+
- name: Sanity 🕊️
26+
id: sanity
27+
uses: ./.github/actions/build

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ jobs:
3939
git config --global core.autocrlf true
4040
git config --global core.longPaths true
4141
Stop-Service -name Docker
42-
- name: Check Out Code
42+
- name: Checkout Code 📥
4343
uses: actions/checkout@v6
44-
- name: Build
44+
- name: Build 📦
4545
id: build
4646
uses: ./.github/actions/build
4747
with:

‎.github/workflows/distribute.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ permissions:
1919
contents: read
2020
jobs:
2121
distribute-spring-enterprise-release-bundle:
22+
name: Distribute Release Bundle 📦
2223
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
2324
steps:
2425
- name: Create Bundle

‎.github/workflows/release-milestone.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
if: ${{ github.repository == 'spring-projects/spring-boot' }}
1515
runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
1616
steps:
17-
- name: Check Out Code
17+
- name: Checkout Code 📥
1818
uses: actions/checkout@v6
19-
- name: Build and Publish
19+
- name: Build 📦 and Publish 📡
2020
id: build-and-publish
2121
uses: ./.github/actions/build
2222
with:
@@ -59,7 +59,7 @@ jobs:
5959
- verify
6060
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
6161
steps:
62-
- name: Check Out Code
62+
- name: Checkout Code 📥
6363
uses: actions/checkout@v6
6464
- name: Sync to Maven Central
6565
uses: ./.github/actions/sync-to-maven-central
@@ -89,7 +89,7 @@ jobs:
8989
- sync-to-maven-central
9090
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
9191
steps:
92-
- name: Check Out Code
92+
- name: Checkout Code 📥
9393
uses: actions/checkout@v6
9494
- name: Publish
9595
uses: ./.github/actions/publish-gradle-plugin
@@ -120,7 +120,7 @@ jobs:
120120
- trigger-docs-build
121121
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
122122
steps:
123-
- name: Check Out Code
123+
- name: Checkout Code 📥
124124
uses: actions/checkout@v6
125125
- name: Create GitHub Release
126126
uses: ./.github/actions/create-github-release

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
if: ${{ github.repository == 'spring-projects/spring-boot' || github.repository == 'spring-projects/spring-boot-commercial' }}
1414
runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }}
1515
steps:
16-
- name: Check Out Code
16+
- name: Checkout Code 📥
1717
uses: actions/checkout@v6
18-
- name: Build and Publish
18+
- name: Build 📦 and Publish 📡
1919
id: build-and-publish
2020
uses: ./.github/actions/build
2121
with:
@@ -70,7 +70,7 @@ jobs:
7070
- verify
7171
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
7272
steps:
73-
- name: Check Out Code
73+
- name: Checkout Code 📥
7474
uses: actions/checkout@v6
7575
- name: Sync to Maven Central
7676
uses: ./.github/actions/sync-to-maven-central
@@ -104,7 +104,7 @@ jobs:
104104
- sync-to-maven-central
105105
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
106106
steps:
107-
- name: Check Out Code
107+
- name: Checkout Code 📥
108108
uses: actions/checkout@v6
109109
- name: Publish
110110
uses: ./.github/actions/publish-gradle-plugin
@@ -121,7 +121,7 @@ jobs:
121121
- sync-to-maven-central
122122
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
123123
steps:
124-
- name: Check Out Code
124+
- name: Checkout Code 📥
125125
uses: actions/checkout@v6
126126
- name: Publish to SDKMAN!
127127
uses: ./.github/actions/publish-to-sdkman
@@ -137,7 +137,7 @@ jobs:
137137
- sync-to-maven-central
138138
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
139139
steps:
140-
- name: Check Out Code
140+
- name: Checkout Code 📥
141141
uses: actions/checkout@v6
142142
- name: Update Homebrew Tap
143143
uses: ./.github/actions/update-homebrew-tap
@@ -168,7 +168,7 @@ jobs:
168168
- update-homebrew-tap
169169
runs-on: ${{ vars.UBUNTU_SMALL || 'ubuntu-latest' }}
170170
steps:
171-
- name: Check Out Code
171+
- name: Checkout Code 📥
172172
uses: actions/checkout@v6
173173
- name: Create GitHub Release
174174
uses: ./.github/actions/create-github-release

‎.github/workflows/run-codeql-analysis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
name: "Run CodeQL Analysis"
1+
name: Run CodeQL Analysis 📊
22
on:
33
push:
44
pull_request:
55
workflow_dispatch:
66
permissions: read-all
77
jobs:
88
run-analysis:
9+
name: Inspect 🔎
910
permissions:
1011
actions: read
1112
contents: read

‎.github/workflows/run-system-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- version: 21
1919
toolchain: true
2020
steps:
21-
- name: Check Out Code
21+
- name: Checkout Code 📥
2222
uses: actions/checkout@v6
2323
- name: Prepare Gradle Build
2424
uses: ./.github/actions/prepare-gradle-build

‎build-plugin/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private Iterable<File> classpathEntries(Spec<File> filter) {
112112
private void moveMetaInfToRoot(CopySpec spec) {
113113
spec.eachFile((file) -> {
114114
String path = file.getRelativeSourcePath().getPathString();
115-
if (path.startsWith("META-INF/") && !path.equals("META-INF/aop.xml") && !path.endsWith(".kotlin_module")
115+
if (path.startsWith("META-INF/") && !"META-INF/aop.xml".equals(path) && !path.endsWith(".kotlin_module")
116116
&& !path.startsWith("META-INF/services/")) {
117117
this.support.moveToRoot(file);
118118
}

0 commit comments

Comments
 (0)