diff --git a/.github/workflows/pass-java-release.yml b/.github/workflows/pass-java-release.yml index 845ae757..426ce6d4 100644 --- a/.github/workflows/pass-java-release.yml +++ b/.github/workflows/pass-java-release.yml @@ -27,34 +27,36 @@ jobs: uses: actions/checkout@v3 with: repository: eclipse-pass/pass-core - path: pass-core + path: ./pass-core - name: Checkout pass-support uses: actions/checkout@v3 with: repository: eclipse-pass/pass-support - path: pass-support + path: ./pass-support - name: Configure git user run: | git config --global user.name ${{ github.actor }} git config --global user.email "${{ github.actor }}@users.noreply.github.com" - - name: Set the release version, commit the change, and tag it - run: | - cd main && mvn versions:set -DnewVersion=$RELEASE && git commit -am "Update version to $RELEASE" && git tag $RELEASE - cd pass-support && mvn versions:set -DnewVersion=$RELEASE && git commit -am "Update version to $RELEASE" && git tag $RELEASE - cd pass-core && mvn versions:set -DnewVersion=$RELEASE && git commit -am "Update version to $RELEASE" && git tag $RELEASE - cd combined && mvn versions:set -DnewVersion=$RELEASE - - name: Create combined module run: | + echo $GITHUB_WORKSPACE + ls -a $GITHUB_WORKSPACE mkdir combined cp main/pom.xml combined cp -r pass-core combined cp -r pass-support combined sed -i '/<\/developers>/a pass-corepass-support' main/pom.xml + - name: Set the release version, commit the change, and tag it + run: | + cd main && mvn versions:set -B -ntp -DnewVersion=$RELEASE && git commit -am "Update version to $RELEASE" && git tag $RELEASE + cd pass-support && mvn versions:set -B -ntp -DnewVersion=$RELEASE && git commit -am "Update version to $RELEASE" && git tag $RELEASE + cd pass-core && mvn versions:set -B -ntp -DnewVersion=$RELEASE && git commit -am "Update version to $RELEASE" && git tag $RELEASE + cd combined && mvn versions:set -B -ntp -DnewVersion=$RELEASE + - name: Setup Java & Maven uses: actions/setup-java@v3 with: @@ -86,7 +88,7 @@ jobs: - name: Release dev Java modules working-directory: combined run: | - mvn -B -U -V -ntp -P release clean install -DskipTests -DskipITs + mvn -B -V -ntp -P release clean install -DskipTests -DskipITs env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}