From c300d462ac89257ab11b3132d5d66318cd872df0 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 2 Jun 2026 09:21:52 +0200 Subject: [PATCH] Refine GitHub Actions workflows. See #3275 --- .github/workflows/ci.yml | 2 ++ .github/workflows/project.yml | 6 +++--- .github/workflows/snapshots.yml | 4 ++++ settings.xml | 29 ----------------------------- 4 files changed, 9 insertions(+), 32 deletions(-) delete mode 100644 settings.xml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ac1ecff0..f6357e7b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,3 +25,5 @@ jobs: uses: spring-projects/spring-data-build/actions/maven-build@3.5.x env: TESTCONTAINERS_REUSE_ENABLE: true + with: + settings-xml: '${{ vars.SETTINGS_XML }}' diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml index 4c8108d35..e01a4a283 100644 --- a/.github/workflows/project.yml +++ b/.github/workflows/project.yml @@ -18,7 +18,7 @@ permissions: jobs: Inbox: runs-on: ubuntu-latest - if: github.repository_owner == 'spring-projects' && (github.event.action == 'opened' || github.event.action == 'reopened') && github.event.pull_request == null && !contains(join(github.event.issue.labels.*.name, ', '), 'dependency-upgrade') && !contains(github.event.issue.title, 'Release ') + if: vars.PROJECT_CARDS_ENABLED == 'true' && github.repository_owner == 'spring-projects' && (github.event.action == 'opened' || github.event.action == 'reopened') && github.event.pull_request == null && !contains(join(github.event.issue.labels.*.name, ', '), 'dependency-upgrade') && !contains(github.event.issue.title, 'Release ') steps: - name: Create or Update Issue Card uses: actions/add-to-project@v1.0.2 @@ -27,7 +27,7 @@ jobs: github-token: ${{ secrets.GH_ISSUES_TOKEN_SPRING_DATA }} Pull-Request: runs-on: ubuntu-latest - if: github.repository_owner == 'spring-projects' && (github.event.action == 'opened' || github.event.action == 'reopened') && github.event.pull_request != null + if: vars.PROJECT_CARDS_ENABLED == 'true' && github.repository_owner == 'spring-projects' && (github.event.action == 'opened' || github.event.action == 'reopened') && github.event.pull_request != null steps: - name: Create or Update Pull Request Card uses: actions/add-to-project@v1.0.2 @@ -36,7 +36,7 @@ jobs: github-token: ${{ secrets.GH_ISSUES_TOKEN_SPRING_DATA }} Feedback-Provided: runs-on: ubuntu-latest - if: github.repository_owner == 'spring-projects' && github.event_name == 'issue_comment' && github.event.action == 'created' && github.actor != 'spring-projects-issues' && github.event.pull_request == null && github.event.issue.state == 'open' && contains(toJSON(github.event.issue.labels), 'waiting-for-feedback') + if: vars.PROJECT_CARDS_ENABLED == 'true' && github.repository_owner == 'spring-projects' && github.event_name == 'issue_comment' && github.event.action == 'created' && github.actor != 'spring-projects-issues' && github.event.pull_request == null && github.event.issue.state == 'open' && contains(toJSON(github.event.issue.labels), 'waiting-for-feedback') steps: - name: Update Project Card uses: actions/add-to-project@v1.0.2 diff --git a/.github/workflows/snapshots.yml b/.github/workflows/snapshots.yml index 1f8b1309f..45f3520a0 100644 --- a/.github/workflows/snapshots.yml +++ b/.github/workflows/snapshots.yml @@ -26,3 +26,7 @@ jobs: build-name: 'spring-data-elasticsearch' username: '${{ secrets.ARTIFACTORY_USERNAME }}' password: '${{ secrets.ARTIFACTORY_PASSWORD }}' + context-url: '${{ vars.ARTIFACTORY_CONTEXT_URL }}' + repository: '${{ vars.ARTIFACTORY_REPOSITORY }}' + project: '${{ vars.ARTIFACTORY_PROJECT }}' + settings-xml: '${{ vars.SETTINGS_XML }}' diff --git a/settings.xml b/settings.xml deleted file mode 100644 index b3227cc11..000000000 --- a/settings.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - spring-plugins-release - ${env.ARTIFACTORY_USR} - ${env.ARTIFACTORY_PSW} - - - spring-libs-snapshot - ${env.ARTIFACTORY_USR} - ${env.ARTIFACTORY_PSW} - - - spring-libs-milestone - ${env.ARTIFACTORY_USR} - ${env.ARTIFACTORY_PSW} - - - spring-libs-release - ${env.ARTIFACTORY_USR} - ${env.ARTIFACTORY_PSW} - - - - \ No newline at end of file