This is an automated email from the ASF dual-hosted git repository.
piergiorgio pushed a commit to branch CONNECTORS-1754
in repository https://gitbox.apache.org/repos/asf/manifoldcf.git
The following commit(s) were added to refs/heads/CONNECTORS-1754 by this push:
new d8b6c1e5f Fix for the GitHub workflows (CONNECTORS-1754)
d8b6c1e5f is described below
commit d8b6c1e5f3552c78f54754492b2b28b212d6c9c4
Author: Piergiorgio Lucidi <[email protected]>
AuthorDate: Thu Jun 20 10:14:57 2024 +0200
Fix for the GitHub workflows (CONNECTORS-1754)
---
.github/asf-deploy-settings.xml | 4 +--
.github/workflows/publish-maven-release.yml | 43 ++++++++++++++++++++++++++---
pom.xml | 2 +-
3 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/.github/asf-deploy-settings.xml b/.github/asf-deploy-settings.xml
index 305c08092..fece670ba 100644
--- a/.github/asf-deploy-settings.xml
+++ b/.github/asf-deploy-settings.xml
@@ -24,8 +24,8 @@
<server>
<id>apache.releases.https</id>
- <username>${{ secrets.NEXUS_USER }}</username>
- <password>${{ secrets.NEXUS_PW }}</password>
+ <username>${{ secrets.NEXUS_STAGE_DEPLOYER_USER }}</username>
+ <password>${{ secrets.NEXUS_STAGE_DEPLOYER_PW }}</password>
</server>
<server>
<id>apache.snapshots.https</id>
diff --git a/.github/workflows/publish-maven-release.yml
b/.github/workflows/publish-maven-release.yml
index f8fdb55f7..5aacbd8d0 100644
--- a/.github/workflows/publish-maven-release.yml
+++ b/.github/workflows/publish-maven-release.yml
@@ -81,6 +81,7 @@ jobs:
server-id: apache.releases.https
server-username: NEXUS_USER
server-password: NEXUS_PW
+ settings-path: ${{ github.workspace
}}/.github/asf-deploy-settings.xml
- name: Ant Build
env:
@@ -95,12 +96,46 @@ jobs:
ant make-core-deps make-deps image
- name: Maven Build
- run: mvn clean install -B -DskipTests -DskipITs
+ run: mvn clean install -B -DskipTests -DskipITs -Papache-release
+
+ - name: Mask Apache Password
+ run: |
+ # Workaround for Actions bug -
https://github.com/actions/runner/issues/643
+ APACHE_PASS=$(jq -r '.inputs.APACHE_PASSWORD' $GITHUB_EVENT_PATH)
+ echo "::add-mask::$APACHE_PASS"
- name: Deploy
env:
- NEXUS_USER: ${{ secrets.NEXUS_USER }}
- NEXUS_PW: ${{ secrets.NEXUS_PW }}
+ NEXUS_USER: ${{ secrets.NEXUS_STAGE_DEPLOYER_USER }}
+ NEXUS_PW: ${{ secrets.NEXUS_STAGE_DEPLOYER_PW }}
+ MAVEN_SETTINGS: ${{ github.workspace
}}/.github/asf-deploy-settings.xml
+ MAVEN_USERNAME: ${{ secrets.NEXUS_STAGE_DEPLOYER_USER }}
+ MAVEN_CENTRAL_TOKEN: ${{ secrets.NEXUS_STAGE_DEPLOYER_PW }}
+ MAVEN_GPG_PASSPHRASE: ""
+ #run: mvn deploy -B -e -q -DskipTests -DskipITs
-DrepositoryId=apache.releases.https -Papache-release
+ run: |
+ mvn -B -e -q org.sonatype.plugins:nexus-staging-maven-plugin:deploy \
+ -DskipTests \
+ -DskipITs \
+ -Dcargo-build.profile=release \
+ -Dcargo-build.features=services-all \
+ -Dcargo-build.enableZigbuild=true \
+ -DskipRemoteStaging=true \
+ -DserverId=apache.releases.https \
+ -DnexusUrl=https://repository.apache.org
+
+ - name: Deploy local staged artifacts
+ if: ${{ github.event_name != 'pull_request' }}
+ run: |
+ ./mvn org.sonatype.plugins:nexus-staging-maven-plugin:deploy-staged \
+ -DskipStagingRepositoryClose=true \
+ -DserverId=apache.releases.https \
+ -DnexusUrl=https://repository.apache.org
+ env:
+ NEXUS_USER: ${{ secrets.NEXUS_STAGE_DEPLOYER_USER }}
+ NEXUS_PW: ${{ secrets.NEXUS_STAGE_DEPLOYER_PW }}
MAVEN_SETTINGS: ${{ github.workspace
}}/.github/asf-deploy-settings.xml
- run: mvn deploy -B -e -DskipTests -DskipITs
-DrepositoryId=apache.releases.https -q
+ MAVEN_USERNAME: ${{ secrets.NEXUS_STAGE_DEPLOYER_USER }}
+ MAVEN_CENTRAL_TOKEN: ${{ secrets.NEXUS_STAGE_DEPLOYER_PW }}
+ MAVEN_GPG_PASSPHRASE: ""
diff --git a/pom.xml b/pom.xml
index fee062c35..e3f69fb0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>31</version>
+ <version>32</version>
</parent>
<modelVersion>4.0.0</modelVersion>
