From de456ee28ce6b8e74a1134777990ee4df5e75804 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Sat, 24 Jun 2023 15:42:19 +0800 Subject: [PATCH 01/15] ci(fix): Load private key as base64 Signed-off-by: Xuanwo --- .github/workflows/bindings_java.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bindings_java.yml b/.github/workflows/bindings_java.yml index fbcfd42e8ac0..d8f960618ad0 100644 --- a/.github/workflows/bindings_java.yml +++ b/.github/workflows/bindings_java.yml @@ -94,9 +94,15 @@ jobs: export-env: true env: OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} - MAVEN_GPG_PRIVATE_KEY: op://services/maven/gpg_private_key + MAVEN_GPG_PRIVATE_KEY_BASE64: op://services/maven/gpg_private_key MAVEN_GPG_PASSPHRASE: op://services/maven/gpg_passphrase + - name: Decode GPG private key + run: | + private_key=`echo "${{ env.MAVEN_GPG_PRIVATE_KEY_BASE64 }}" | base64 -d` + echo "::add-mask::${private_key}" + echo "MAVEN_GPG_PRIVATE_KEY=${private_key}" >> $GITHUB_ENV + - name: Set up JDK 8 uses: actions/setup-java@v3 with: @@ -134,9 +140,15 @@ jobs: export-env: true env: OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} - MAVEN_GPG_PRIVATE_KEY: op://services/maven/gpg_private_key + MAVEN_GPG_PRIVATE_KEY_BASE64: op://services/maven/gpg_private_key MAVEN_GPG_PASSPHRASE: op://services/maven/gpg_passphrase + - name: Decode GPG private key + run: | + private_key=`echo "${{ env.MAVEN_GPG_PRIVATE_KEY_BASE64 }}" | base64 -d` + echo "::add-mask::${private_key}" + echo "MAVEN_GPG_PRIVATE_KEY=${private_key}" >> $GITHUB_ENV + - name: Set up JDK 8 uses: actions/setup-java@v3 with: From 95f4fac3864d76f2308617130a89848230b08862 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Sat, 24 Jun 2023 15:49:25 +0800 Subject: [PATCH 02/15] Fix lines Signed-off-by: Xuanwo --- .github/workflows/bindings_java.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bindings_java.yml b/.github/workflows/bindings_java.yml index d8f960618ad0..eb14b6031508 100644 --- a/.github/workflows/bindings_java.yml +++ b/.github/workflows/bindings_java.yml @@ -98,10 +98,13 @@ jobs: MAVEN_GPG_PASSPHRASE: op://services/maven/gpg_passphrase - name: Decode GPG private key + id: key run: | private_key=`echo "${{ env.MAVEN_GPG_PRIVATE_KEY_BASE64 }}" | base64 -d` echo "::add-mask::${private_key}" - echo "MAVEN_GPG_PRIVATE_KEY=${private_key}" >> $GITHUB_ENV + echo "MAVEN_GPG_PRIVATE_KEY<> $GITHUB_ENV + echo ${private_key} >> $GITHUB_ENV + echo "EOF" >> $GITHUB_ENV - name: Set up JDK 8 uses: actions/setup-java@v3 @@ -147,7 +150,9 @@ jobs: run: | private_key=`echo "${{ env.MAVEN_GPG_PRIVATE_KEY_BASE64 }}" | base64 -d` echo "::add-mask::${private_key}" - echo "MAVEN_GPG_PRIVATE_KEY=${private_key}" >> $GITHUB_ENV + echo "MAVEN_GPG_PRIVATE_KEY<> $GITHUB_ENV + echo ${private_key} >> $GITHUB_ENV + echo "EOF" >> $GITHUB_ENV - name: Set up JDK 8 uses: actions/setup-java@v3 From 9a8ae6fd8e20a00b70356f74c52068eb3ff4be1d Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Sat, 24 Jun 2023 15:55:48 +0800 Subject: [PATCH 03/15] Fix shell Signed-off-by: Xuanwo --- .github/workflows/bindings_java.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bindings_java.yml b/.github/workflows/bindings_java.yml index eb14b6031508..14c94ec481bc 100644 --- a/.github/workflows/bindings_java.yml +++ b/.github/workflows/bindings_java.yml @@ -100,7 +100,7 @@ jobs: - name: Decode GPG private key id: key run: | - private_key=`echo "${{ env.MAVEN_GPG_PRIVATE_KEY_BASE64 }}" | base64 -d` + private_key=$(echo "${{ env.MAVEN_GPG_PRIVATE_KEY_BASE64 }}" | base64 -d) echo "::add-mask::${private_key}" echo "MAVEN_GPG_PRIVATE_KEY<> $GITHUB_ENV echo ${private_key} >> $GITHUB_ENV @@ -148,7 +148,7 @@ jobs: - name: Decode GPG private key run: | - private_key=`echo "${{ env.MAVEN_GPG_PRIVATE_KEY_BASE64 }}" | base64 -d` + private_key=$(echo "${{ env.MAVEN_GPG_PRIVATE_KEY_BASE64 }}" | base64 -d) echo "::add-mask::${private_key}" echo "MAVEN_GPG_PRIVATE_KEY<> $GITHUB_ENV echo ${private_key} >> $GITHUB_ENV From d26b8b678837c04fc7e9cc7d187c241e8c4da801 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Sat, 24 Jun 2023 15:59:30 +0800 Subject: [PATCH 04/15] Fix mask Signed-off-by: Xuanwo --- .github/workflows/bindings_java.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bindings_java.yml b/.github/workflows/bindings_java.yml index 14c94ec481bc..2f2084aca741 100644 --- a/.github/workflows/bindings_java.yml +++ b/.github/workflows/bindings_java.yml @@ -101,7 +101,13 @@ jobs: id: key run: | private_key=$(echo "${{ env.MAVEN_GPG_PRIVATE_KEY_BASE64 }}" | base64 -d) - echo "::add-mask::${private_key}" + + # Mask + while read -r line; + do + echo "::add-mask::${line}" + done <<< "${private_key}" + echo "MAVEN_GPG_PRIVATE_KEY<> $GITHUB_ENV echo ${private_key} >> $GITHUB_ENV echo "EOF" >> $GITHUB_ENV @@ -149,7 +155,13 @@ jobs: - name: Decode GPG private key run: | private_key=$(echo "${{ env.MAVEN_GPG_PRIVATE_KEY_BASE64 }}" | base64 -d) - echo "::add-mask::${private_key}" + + # Mask + while read -r line; + do + echo "::add-mask::${line}" + done <<< "${private_key}" + echo "MAVEN_GPG_PRIVATE_KEY<> $GITHUB_ENV echo ${private_key} >> $GITHUB_ENV echo "EOF" >> $GITHUB_ENV From 30c9c6d7d41d7f38af640dc6a57d1ae60530928e Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Sun, 25 Jun 2023 10:31:49 +0800 Subject: [PATCH 05/15] Fix java Signed-off-by: Xuanwo --- .github/workflows/bindings_java.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bindings_java.yml b/.github/workflows/bindings_java.yml index 2f2084aca741..dcfc83802564 100644 --- a/.github/workflows/bindings_java.yml +++ b/.github/workflows/bindings_java.yml @@ -119,7 +119,7 @@ jobs: java-version: '8' cache: 'maven' gpg-private-key: ${{ env.MAVEN_GPG_PRIVATE_KEY }} - gpg-passphrase: ${{ env.MAVEN_GPG_PASSPHRASE }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE - uses: actions/setup-python@v4 with: python-version: '3.10' @@ -176,7 +176,7 @@ jobs: server-username: MAVEN_USERNAME server-password: MAVEN_CENTRAL_TOKEN gpg-private-key: ${{ env.MAVEN_GPG_PRIVATE_KEY }} - gpg-passphrase: ${{ env.MAVEN_GPG_PASSPHRASE }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Prepare enviroment variables run: echo "LOCAL_STAGING_DIR=$HOME/local-staging" >> $GITHUB_ENV From c1d742c9ce6350c052fca8a4a5351e1e891ecf8c Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Sun, 25 Jun 2023 10:41:47 +0800 Subject: [PATCH 06/15] Don't depend on setup-java Signed-off-by: Xuanwo --- .github/workflows/bindings_java.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/bindings_java.yml b/.github/workflows/bindings_java.yml index dcfc83802564..5c2582ab078a 100644 --- a/.github/workflows/bindings_java.yml +++ b/.github/workflows/bindings_java.yml @@ -96,6 +96,7 @@ jobs: OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} MAVEN_GPG_PRIVATE_KEY_BASE64: op://services/maven/gpg_private_key MAVEN_GPG_PASSPHRASE: op://services/maven/gpg_passphrase + MAVEN_GPG_KEY_ID: op://services/maven/gpg_key_id - name: Decode GPG private key id: key @@ -108,9 +109,8 @@ jobs: echo "::add-mask::${line}" done <<< "${private_key}" - echo "MAVEN_GPG_PRIVATE_KEY<> $GITHUB_ENV - echo ${private_key} >> $GITHUB_ENV - echo "EOF" >> $GITHUB_ENV + echo ${private_key} | gpg --batch --passphrase "${MAVEN_GPG_PASSPHRASE}" --import - + echo -e "5\ny\n" | gpg --command-fd 0 --edit-key ${MAVEN_GPG_KEY_ID} trust - name: Set up JDK 8 uses: actions/setup-java@v3 @@ -118,7 +118,6 @@ jobs: distribution: 'temurin' java-version: '8' cache: 'maven' - gpg-private-key: ${{ env.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE - uses: actions/setup-python@v4 with: @@ -162,9 +161,8 @@ jobs: echo "::add-mask::${line}" done <<< "${private_key}" - echo "MAVEN_GPG_PRIVATE_KEY<> $GITHUB_ENV - echo ${private_key} >> $GITHUB_ENV - echo "EOF" >> $GITHUB_ENV + echo ${private_key} | gpg --batch --passphrase "${MAVEN_GPG_PASSPHRASE}" --import - + echo -e "5\ny\n" | gpg --command-fd 0 --edit-key ${MAVEN_GPG_KEY_ID} trust - name: Set up JDK 8 uses: actions/setup-java@v3 @@ -175,7 +173,6 @@ jobs: server-id: apache.snapshots.https server-username: MAVEN_USERNAME server-password: MAVEN_CENTRAL_TOKEN - gpg-private-key: ${{ env.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Prepare enviroment variables From 05a8ab2e93dbd5c0c69eb7350c12d10996c22039 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Sun, 25 Jun 2023 10:43:16 +0800 Subject: [PATCH 07/15] Fix shell Signed-off-by: Xuanwo --- .github/workflows/bindings_java.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bindings_java.yml b/.github/workflows/bindings_java.yml index 5c2582ab078a..44abae4601e9 100644 --- a/.github/workflows/bindings_java.yml +++ b/.github/workflows/bindings_java.yml @@ -101,7 +101,7 @@ jobs: - name: Decode GPG private key id: key run: | - private_key=$(echo "${{ env.MAVEN_GPG_PRIVATE_KEY_BASE64 }}" | base64 -d) + private_key=$(echo "${MAVEN_GPG_PRIVATE_KEY_BASE64}" | base64 -d) # Mask while read -r line; @@ -153,7 +153,7 @@ jobs: - name: Decode GPG private key run: | - private_key=$(echo "${{ env.MAVEN_GPG_PRIVATE_KEY_BASE64 }}" | base64 -d) + private_key=$(echo "${MAVEN_GPG_PRIVATE_KEY_BASE64}" | base64 -d) # Mask while read -r line; From dd0340632abdc5692882a63ee681566f161fdd09 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Sun, 25 Jun 2023 11:01:37 +0800 Subject: [PATCH 08/15] Try Signed-off-by: Xuanwo --- .github/workflows/bindings_java.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bindings_java.yml b/.github/workflows/bindings_java.yml index 44abae4601e9..f98f044e20f5 100644 --- a/.github/workflows/bindings_java.yml +++ b/.github/workflows/bindings_java.yml @@ -109,8 +109,7 @@ jobs: echo "::add-mask::${line}" done <<< "${private_key}" - echo ${private_key} | gpg --batch --passphrase "${MAVEN_GPG_PASSPHRASE}" --import - - echo -e "5\ny\n" | gpg --command-fd 0 --edit-key ${MAVEN_GPG_KEY_ID} trust + echo ${private_key} | gpg --import - - name: Set up JDK 8 uses: actions/setup-java@v3 @@ -161,8 +160,7 @@ jobs: echo "::add-mask::${line}" done <<< "${private_key}" - echo ${private_key} | gpg --batch --passphrase "${MAVEN_GPG_PASSPHRASE}" --import - - echo -e "5\ny\n" | gpg --command-fd 0 --edit-key ${MAVEN_GPG_KEY_ID} trust + echo ${private_key} | gpg --import - - name: Set up JDK 8 uses: actions/setup-java@v3 From 8cf84863b5a07cf2d1898372193edaa98a76b723 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Sun, 25 Jun 2023 11:17:32 +0800 Subject: [PATCH 09/15] Remove trick Signed-off-by: Xuanwo --- .github/workflows/bindings_java.yml | 31 ++++------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/.github/workflows/bindings_java.yml b/.github/workflows/bindings_java.yml index f98f044e20f5..669f664617d8 100644 --- a/.github/workflows/bindings_java.yml +++ b/.github/workflows/bindings_java.yml @@ -94,29 +94,17 @@ jobs: export-env: true env: OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} - MAVEN_GPG_PRIVATE_KEY_BASE64: op://services/maven/gpg_private_key + MAVEN_GPG_PRIVATE_KEY: op://services/maven/gpg_private_key MAVEN_GPG_PASSPHRASE: op://services/maven/gpg_passphrase MAVEN_GPG_KEY_ID: op://services/maven/gpg_key_id - - name: Decode GPG private key - id: key - run: | - private_key=$(echo "${MAVEN_GPG_PRIVATE_KEY_BASE64}" | base64 -d) - - # Mask - while read -r line; - do - echo "::add-mask::${line}" - done <<< "${private_key}" - - echo ${private_key} | gpg --import - - - name: Set up JDK 8 uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: '8' cache: 'maven' + gpg-private-key: ${{ env.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE - uses: actions/setup-python@v4 with: @@ -147,21 +135,9 @@ jobs: export-env: true env: OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} - MAVEN_GPG_PRIVATE_KEY_BASE64: op://services/maven/gpg_private_key + MAVEN_GPG_PRIVATE_KEY: op://services/maven/gpg_private_key MAVEN_GPG_PASSPHRASE: op://services/maven/gpg_passphrase - - name: Decode GPG private key - run: | - private_key=$(echo "${MAVEN_GPG_PRIVATE_KEY_BASE64}" | base64 -d) - - # Mask - while read -r line; - do - echo "::add-mask::${line}" - done <<< "${private_key}" - - echo ${private_key} | gpg --import - - - name: Set up JDK 8 uses: actions/setup-java@v3 with: @@ -171,6 +147,7 @@ jobs: server-id: apache.snapshots.https server-username: MAVEN_USERNAME server-password: MAVEN_CENTRAL_TOKEN + gpg-private-key: ${{ env.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Prepare enviroment variables From ecf9f52295a005f0e71eb9b908f202e9baec92c9 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Sun, 25 Jun 2023 11:21:17 +0800 Subject: [PATCH 10/15] disable windows for temp Signed-off-by: Xuanwo --- .github/workflows/bindings_java.yml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/bindings_java.yml b/.github/workflows/bindings_java.yml index 669f664617d8..9703750bf5bd 100644 --- a/.github/workflows/bindings_java.yml +++ b/.github/workflows/bindings_java.yml @@ -78,8 +78,9 @@ jobs: include: - os: ubuntu-latest classifier: linux-x86_64 - - os: windows-latest - classifier: windows-x86_64 + # FIXME: Windows is not supported yet. + # - os: windows-latest + # classifier: windows-x86_64 - os: macos-latest classifier: osx-x86_64 - os: macos-latest @@ -153,11 +154,12 @@ jobs: - name: Prepare enviroment variables run: echo "LOCAL_STAGING_DIR=$HOME/local-staging" >> $GITHUB_ENV - - name: Download windows staging directory - uses: actions/download-artifact@v3 - with: - name: windows-x86_64-local-staging - path: ~/windows-x86_64-local-staging + # - name: Download windows staging directory + # uses: actions/download-artifact@v3 + # with: + # name: windows-x86_64-local-staging + # path: ~/windows-x86_64-local-staging + - name: Download linux staging directory uses: actions/download-artifact@v3 with: @@ -177,12 +179,16 @@ jobs: - name: Merge staging repositories run: | mkdir -p ~/local-staging/deferred - cat ~/windows-x86_64-local-staging/deferred/.index >> ~/local-staging/deferred/.index - cp -r ~/windows-x86_64-local-staging/deferred/* ~/local-staging/deferred/ + + # cat ~/windows-x86_64-local-staging/deferred/.index >> ~/local-staging/deferred/.index + # cp -r ~/windows-x86_64-local-staging/deferred/* ~/local-staging/deferred/ + cat ~/linux-x86_64-local-staging/deferred/.index >> ~/local-staging/deferred/.index cp -r ~/linux-x86_64-local-staging/deferred/* ~/local-staging/deferred/ + cat ~/osx-x86_64-local-staging/deferred/.index >> ~/local-staging/deferred/.index cp -r ~/osx-x86_64-local-staging/deferred/* ~/local-staging/deferred/ + cat ~/osx-aarch_64-local-staging/deferred/.index >> ~/local-staging/deferred/.index cp -r ~/osx-aarch_64-local-staging/deferred/* ~/local-staging/deferred/ From 1d22f8e4bb767f47745965ede71b026539b2201c Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Sun, 25 Jun 2023 11:29:13 +0800 Subject: [PATCH 11/15] Add server id Signed-off-by: Xuanwo --- .github/workflows/bindings_java.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/bindings_java.yml b/.github/workflows/bindings_java.yml index 9703750bf5bd..8d48465d3ac7 100644 --- a/.github/workflows/bindings_java.yml +++ b/.github/workflows/bindings_java.yml @@ -105,6 +105,9 @@ jobs: distribution: 'temurin' java-version: '8' cache: 'maven' + server-id: apache.snapshots.https + server-username: MAVEN_USERNAME + server-password: MAVEN_CENTRAL_TOKEN gpg-private-key: ${{ env.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE - uses: actions/setup-python@v4 @@ -115,7 +118,10 @@ jobs: working-directory: bindings/java run: mvn -Papache-release package verify org.sonatype.plugins:nexus-staging-maven-plugin:deploy -DjniClassifier=${{ matrix.classifier }} -DskipTests=true -DaltStagingDirectory=local-staging -DskipRemoteStaging=true env: + MAVEN_USERNAME: ${{ secrets.NEXUS_USER }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.NEXUS_PW }} MAVEN_GPG_PASSPHRASE: ${{ env.MAVEN_GPG_PASSPHRASE }} + - name: Upload local staging directory uses: actions/upload-artifact@v3 with: From 27a0058c45cb6a523d9d1cfa3bff63dea4b9821d Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Sun, 25 Jun 2023 14:46:50 +0800 Subject: [PATCH 12/15] reorg Signed-off-by: Xuanwo --- .github/workflows/bindings_java.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bindings_java.yml b/.github/workflows/bindings_java.yml index 8d48465d3ac7..fa473c9b1e1e 100644 --- a/.github/workflows/bindings_java.yml +++ b/.github/workflows/bindings_java.yml @@ -87,6 +87,9 @@ jobs: classifier: osx-aarch_64 steps: - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: '3.10' - name: Load secret id: op-load-secret @@ -110,9 +113,6 @@ jobs: server-password: MAVEN_CENTRAL_TOKEN gpg-private-key: ${{ env.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE - - uses: actions/setup-python@v4 - with: - python-version: '3.10' - name: Local staging working-directory: bindings/java From 83fc102a55eca4fbeaf5e117327a053341d7f6e4 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Sun, 25 Jun 2023 14:51:59 +0800 Subject: [PATCH 13/15] fix cli Signed-off-by: Xuanwo --- .github/workflows/bindings_java.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bindings_java.yml b/.github/workflows/bindings_java.yml index fa473c9b1e1e..238d5935fd32 100644 --- a/.github/workflows/bindings_java.yml +++ b/.github/workflows/bindings_java.yml @@ -116,7 +116,14 @@ jobs: - name: Local staging working-directory: bindings/java - run: mvn -Papache-release package verify org.sonatype.plugins:nexus-staging-maven-plugin:deploy -DjniClassifier=${{ matrix.classifier }} -DskipTests=true -DaltStagingDirectory=local-staging -DskipRemoteStaging=true + run: | + mvn -Papache-release package verify \ + org.sonatype.plugins:nexus-staging-maven-plugin:deploy \ + -DjniClassifier=${{ matrix.classifier }} \ + -DskipTests=true \ + -DaltStagingDirectory=local-staging \ + -DskipRemoteStaging=true \ + -DnexusUrl=https://repository.apache.org env: MAVEN_USERNAME: ${{ secrets.NEXUS_USER }} MAVEN_CENTRAL_TOKEN: ${{ secrets.NEXUS_PW }} @@ -201,7 +208,10 @@ jobs: - name: Deploy local staged artifacts if: ${{ github.event_name != 'pull_request' }} working-directory: bindings/java - run: mvn org.sonatype.plugins:nexus-staging-maven-plugin:deploy-staged -DaltStagingDirectory=$LOCAL_STAGING_DIR + run: | + mvn org.sonatype.plugins:nexus-staging-maven-plugin:deploy-staged \ + -DaltStagingDirectory=$LOCAL_STAGING_DIR \ + -DnexusUrl=https://repository.apache.org env: MAVEN_USERNAME: ${{ secrets.NEXUS_USER }} MAVEN_CENTRAL_TOKEN: ${{ secrets.NEXUS_PW }} From 2619c2f1da93539e852877d2202b3cf93e5f60d2 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Sun, 25 Jun 2023 14:58:14 +0800 Subject: [PATCH 14/15] Fix cli Signed-off-by: Xuanwo --- .github/workflows/bindings_java.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/bindings_java.yml b/.github/workflows/bindings_java.yml index 238d5935fd32..2bd979a1d6ff 100644 --- a/.github/workflows/bindings_java.yml +++ b/.github/workflows/bindings_java.yml @@ -123,6 +123,7 @@ jobs: -DskipTests=true \ -DaltStagingDirectory=local-staging \ -DskipRemoteStaging=true \ + -DserverId=apache.snapshots.https \ -DnexusUrl=https://repository.apache.org env: MAVEN_USERNAME: ${{ secrets.NEXUS_USER }} @@ -211,6 +212,7 @@ jobs: run: | mvn org.sonatype.plugins:nexus-staging-maven-plugin:deploy-staged \ -DaltStagingDirectory=$LOCAL_STAGING_DIR \ + -DserverId=apache.snapshots.https \ -DnexusUrl=https://repository.apache.org env: MAVEN_USERNAME: ${{ secrets.NEXUS_USER }} From 3d4d9f73249b4ab91f22f2291b317c2751ac6963 Mon Sep 17 00:00:00 2001 From: tison Date: Sun, 25 Jun 2023 15:20:52 +0800 Subject: [PATCH 15/15] try fix java snapshot release workflow Signed-off-by: tison --- .github/workflows/bindings_java.yml | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/.github/workflows/bindings_java.yml b/.github/workflows/bindings_java.yml index 2bd979a1d6ff..2bd5500edcc2 100644 --- a/.github/workflows/bindings_java.yml +++ b/.github/workflows/bindings_java.yml @@ -72,13 +72,12 @@ jobs: stage-snapshot: runs-on: ${{ matrix.os }} - if: github.event_name == 'push' || !github.event.pull_request.head.repo.fork strategy: matrix: include: - os: ubuntu-latest classifier: linux-x86_64 - # FIXME: Windows is not supported yet. + # FIXME: Windows is not supported due to 1password action limitation. # - os: windows-latest # classifier: windows-x86_64 - os: macos-latest @@ -100,7 +99,6 @@ jobs: OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} MAVEN_GPG_PRIVATE_KEY: op://services/maven/gpg_private_key MAVEN_GPG_PASSPHRASE: op://services/maven/gpg_passphrase - MAVEN_GPG_KEY_ID: op://services/maven/gpg_key_id - name: Set up JDK 8 uses: actions/setup-java@v3 @@ -108,26 +106,13 @@ jobs: distribution: 'temurin' java-version: '8' cache: 'maven' - server-id: apache.snapshots.https - server-username: MAVEN_USERNAME - server-password: MAVEN_CENTRAL_TOKEN gpg-private-key: ${{ env.MAVEN_GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE - name: Local staging working-directory: bindings/java - run: | - mvn -Papache-release package verify \ - org.sonatype.plugins:nexus-staging-maven-plugin:deploy \ - -DjniClassifier=${{ matrix.classifier }} \ - -DskipTests=true \ - -DaltStagingDirectory=local-staging \ - -DskipRemoteStaging=true \ - -DserverId=apache.snapshots.https \ - -DnexusUrl=https://repository.apache.org + run: mvn -Papache-release package verify org.sonatype.plugins:nexus-staging-maven-plugin:deploy -DjniClassifier=${{ matrix.classifier }} -DskipTests=true -DaltStagingDirectory=local-staging -DskipRemoteStaging=true env: - MAVEN_USERNAME: ${{ secrets.NEXUS_USER }} - MAVEN_CENTRAL_TOKEN: ${{ secrets.NEXUS_PW }} MAVEN_GPG_PASSPHRASE: ${{ env.MAVEN_GPG_PASSPHRASE }} - name: Upload local staging directory @@ -139,7 +124,6 @@ jobs: deploy-snapshots: runs-on: ubuntu-latest - if: github.event_name == 'push' || !github.event.pull_request.head.repo.fork needs: [stage-snapshot] steps: - uses: actions/checkout@v3 @@ -209,11 +193,7 @@ jobs: - name: Deploy local staged artifacts if: ${{ github.event_name != 'pull_request' }} working-directory: bindings/java - run: | - mvn org.sonatype.plugins:nexus-staging-maven-plugin:deploy-staged \ - -DaltStagingDirectory=$LOCAL_STAGING_DIR \ - -DserverId=apache.snapshots.https \ - -DnexusUrl=https://repository.apache.org + run: mvn org.sonatype.plugins:nexus-staging-maven-plugin:deploy-staged -DaltStagingDirectory=$LOCAL_STAGING_DIR env: MAVEN_USERNAME: ${{ secrets.NEXUS_USER }} MAVEN_CENTRAL_TOKEN: ${{ secrets.NEXUS_PW }}