From c723d9a45130004417eb725bbdf338680bab6343 Mon Sep 17 00:00:00 2001 From: William Hyun Date: Sat, 26 Jul 2025 15:14:14 -0700 Subject: [PATCH 1/3] ORC-XXX: Enforce Apache release profile with maven install --- .github/workflows/build_and_test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 750dec550c..3dabcbcee6 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -151,6 +151,8 @@ jobs: DEFAULT_BRANCH: main VALIDATE_MARKDOWN: true GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ASF_USERNAME: ${{ secrets.NEXUS_USER }} + ASF_PASSWORD: ${{ secrets.NEXUS_PW }} - name: Install Java 17 uses: actions/setup-java@v4 with: @@ -161,7 +163,7 @@ jobs: run: | mkdir -p ~/.m2 cd java - ./mvnw install -DskipTests + ./mvnw install -DskipTests -Papache-release ./mvnw javadoc:javadoc cpp-linter: From f451890a5a33287763c9de606dfe10b22229ea4d Mon Sep 17 00:00:00 2001 From: William Hyun Date: Sat, 26 Jul 2025 15:21:09 -0700 Subject: [PATCH 2/3] Fix env variable --- .github/workflows/build_and_test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 3dabcbcee6..d9d7b2b15e 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -163,7 +163,8 @@ jobs: run: | mkdir -p ~/.m2 cd java - ./mvnw install -DskipTests -Papache-release + echo "apache.snapshots.https$ASF_USERNAME$ASF_PASSWORD" > settings.xml + ./mvnw --settings settings.xml install -DskipTests -Papache-release ./mvnw javadoc:javadoc cpp-linter: From 63dbfc9ca613df14df6bbf2226359b81f5d928a5 Mon Sep 17 00:00:00 2001 From: William Hyun Date: Sat, 26 Jul 2025 15:44:26 -0700 Subject: [PATCH 3/3] Move enforcement to CI --- .github/workflows/build_and_test.yml | 5 +---- .github/workflows/publish_snapshot.yml | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index d9d7b2b15e..750dec550c 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -151,8 +151,6 @@ jobs: DEFAULT_BRANCH: main VALIDATE_MARKDOWN: true GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - ASF_USERNAME: ${{ secrets.NEXUS_USER }} - ASF_PASSWORD: ${{ secrets.NEXUS_PW }} - name: Install Java 17 uses: actions/setup-java@v4 with: @@ -163,8 +161,7 @@ jobs: run: | mkdir -p ~/.m2 cd java - echo "apache.snapshots.https$ASF_USERNAME$ASF_PASSWORD" > settings.xml - ./mvnw --settings settings.xml install -DskipTests -Papache-release + ./mvnw install -DskipTests ./mvnw javadoc:javadoc cpp-linter: diff --git a/.github/workflows/publish_snapshot.yml b/.github/workflows/publish_snapshot.yml index eb6d771238..ccbc5fcf7e 100644 --- a/.github/workflows/publish_snapshot.yml +++ b/.github/workflows/publish_snapshot.yml @@ -24,4 +24,6 @@ jobs: run: | cd java echo "apache.snapshots.https$ASF_USERNAME$ASF_PASSWORD" > settings.xml + # We should use local installation to test `apache-release` profile + ./mvnw --settings settings.xml -nsu -ntp -DskipTests install -Papache-release ./mvnw --settings settings.xml -nsu -ntp -DskipTests deploy