Skip to content

Commit ff39855

Browse files
committed
Merge maven-ci-settings.xml and maven-cd-settings in a single maven-settings.xml
1 parent 31cdbb8 commit ff39855

4 files changed

Lines changed: 3 additions & 70 deletions

File tree

.github/maven-ci-settings.xml

Lines changed: 0 additions & 67 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ jobs:
3838
distribution: temurin
3939
- name: Run tests
4040
if: ${{ runner.os != 'Linux' || inputs.container != '' }}
41-
run: mvn -s .github/maven-ci-settings.xml -q clean verify -B -Pcheckstyle ${{ inputs.profile }}
41+
run: mvn -s .github/maven-settings.xml -q clean verify -B -Pcheckstyle ${{ inputs.profile }}
4242
- name: Run tests
4343
if: ${{ runner.os == 'Linux' && inputs.container == '' }}
4444
run: |
4545
# io_uring testing requires more locked memory for kernel ring buffers than the default 8MB limit
4646
sudo prlimit --pid $$ --memlock=16777216:16777216
47-
mvn -s .github/maven-ci-settings.xml -q clean verify -B -Pcheckstyle ${{ inputs.profile }}
47+
mvn -s .github/maven-settings.xml -q clean verify -B -Pcheckstyle ${{ inputs.profile }}

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ jobs:
3131
run: echo "PROJECT_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:evaluate -Dexpression=project.version -q -DforceStdout | grep -v '\[')" >> $GITHUB_ENV
3232
- name: Maven deploy
3333
if: ${{ endsWith(env.PROJECT_VERSION, '-SNAPSHOT') }}
34-
run: mvn deploy -s .github/maven-cd-settings.xml -DskipTests -B -Ptoolchain,Java21
34+
run: mvn deploy -s .github/maven-settings.xml -DskipTests -B -Ptoolchain,Java21

0 commit comments

Comments
 (0)