Merge changes from 8.x.x

adoptium · Aug 23, 2021 · e0dad9d · e0dad9d
1 parent 7c785e5
commit e0dad9d
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,7 +35,7 @@ jobs:
       releaseTag: ${{ github.event.inputs.releaseTag || '8.2.0-SNAPSHOT' }}
       checkoutRef: ${{ github.event.inputs.checkoutRef || 'master' }}
       version: ${{ github.event.inputs.version || '8.2.0-SNAPSHOT' }}
-      agentVersion: ${{ github.event.inputs.releaseTag || '1.0.1-SNAPSHOT' }}
+      agentVersion: ${{ github.event.inputs.agentVersion || '1.0.1-SNAPSHOT' }}
     steps:
       - name: info
         run: echo Initialize outputs...
@@ -45,6 +45,8 @@ jobs:
     needs: release
     name: Build
     runs-on: ubuntu-latest
+    env:
+      MAVEN_OPTS: -Xmx2048m -Declipse.p2.mirrors=false
     steps:
       - name: Checkout JMC
         uses: actions/checkout@v2
@@ -73,8 +75,7 @@ jobs:
         run: |
           find . ! -path "*/.git/**" -type f -name "pom.xml" -exec sed -i s/"${{ needs.release.outputs.version }}-SNAPSHOT"/"${{ needs.release.outputs.version }}"/ {} \;
           find . ! -path "*/.git/**" -type f \( -name "feature.xml" -o -name "MANIFEST.MF" \) -exec sed -i s/"${{ needs.release.outputs.version }}.qualifier"/"${{ needs.release.outputs.version }}"/ {} \;
-          find . ! -path "*/.git/**" -type f -name "pom.xml" -exec sed -i s/"${{ needs.release.outputs.agentVersion }}-SNAPSHOT"/"${{ needs.release.outputs.agentVersion }}"/ {} \;
-          find . ! -path "*/.git/**" -type f \( -name "feature.xml" -o -name "MANIFEST.MF" \) -exec sed -i s/"${{ needs.release.outputs.agentVersion }}.qualifier"/"${{ needs.release.outputs.agentVersion }}"/ {} \;
+          echo "MAVEN_OPTS=$MAVEN_OPTS -DskipNexusStagingDeployMojo=true -Dchangelist=" >> $GITHUB_ENV
 
       - name: Set up JDK 11
         uses: actions/setup-java@v1
@@ -118,8 +119,6 @@ jobs:
           mvn jetty:run &
           cd ../../
           mvn package
-        env:
-          MAVEN_OPTS: -Xmx2048m -Declipse.p2.mirrors=false
         working-directory: releng/third-party
 
       - name: Run Unit Tests
@@ -144,24 +143,17 @@ jobs:
           PASSWORD: ${{ secrets.PASSWORD }}
         working-directory: application/org.openjdk.jmc.updatesite.ide/target/repository
 
-      - uses: actions/upload-artifact@v2
-        with:
-          name: jmc
-          path: |
-            agent/target/agent-*.jar
-            target/products/*.tar.gz
-            target/products/*.zip
-            application/org.openjdk.jmc.updatesite.ide/target/*.zip
-
-      - if: needs.release.outputs.release == 'True' && endsWith(needs.release.outputs.version, '-SNAPSHOT')
+      - if: needs.release.outputs.release == 'True'
         name: Delete old linux assets from ${{ needs.release.outputs.releaseTag }}
         uses: mknejp/delete-release-assets@v1
         with:
           token: ${{ github.token }}
           tag: ${{ needs.release.outputs.releaseTag }}
           assets: |
             release*
-            ${{ needs.release.outputs.version }}*
+            agent-*
+            org.openjdk.jmc.updatesite.ide-*
+            org.openjdk.jmc-*.x86_64.*
           fail-if-no-assets: false
           fail-if-no-release: false