diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index a317ab3..27d9c91 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -17,10 +17,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' cache: maven @@ -72,20 +72,26 @@ jobs: # env: # GITHUB_TOKEN: ${{ github.token }} - - name: Build with RELEASE210 - run: | - mvn -B clean install -P dev -Dnetbeans.release.version=RELEASE210 -Dnext.version=RELEASE210 - env: - GITHUB_TOKEN: ${{ github.token }} +# - name: Build with RELEASE210 +# run: | +# mvn -B clean install -P dev -Dnetbeans.release.version=RELEASE210 -Dnext.version=RELEASE210 +# env: +# GITHUB_TOKEN: ${{ github.token }} +# +# - name: Build with RELEASE220 +# run: | +# mvn -B clean install -P dev -Dnetbeans.release.version=RELEASE220 -Dnext.version=RELEASE220 +# env: +# GITHUB_TOKEN: ${{ github.token }} - - name: Build with RELEASE220 - run: | - mvn -B clean install -P dev -Dnetbeans.release.version=RELEASE220 -Dnext.version=RELEASE220 - env: - GITHUB_TOKEN: ${{ github.token }} +# - name: Build with RELEASE230 +# run: | +# mvn -B clean install -P dev -Dnetbeans.release.version=RELEASE230 -Dnext.version=RELEASE230 +# env: +# GITHUB_TOKEN: ${{ github.token }} - - name: Build with RELEASE230 + - name: Build with RELEASE240 run: | - mvn -B clean install -P dev -Dnetbeans.release.version=RELEASE230 -Dnext.version=RELEASE230 + mvn -B clean install -P dev -Dnetbeans.release.version=RELEASE240 -Dnext.version=RELEASE240 env: GITHUB_TOKEN: ${{ github.token }} \ No newline at end of file diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index fece2b5..7775162 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -33,10 +33,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' cache: maven #Maven Publish to Github @@ -61,17 +61,6 @@ jobs: run: | sed -i "s/OpenIDE-Module-Specification-Version:.*/OpenIDE-Module-Specification-Version: ${{ env.RELEASE_VERSION }}/" src/main/nbm/manifest.mf - - name: Create Release - uses: actions/create-release@v1 - id: create_release - with: - draft: false - prerelease: false - release_name: ${{ github.event.repository.name }} ${{ env.RELEASE_VERSION }} - tag_name: ${{ env.RELEASE_VERSION }} - env: - GITHUB_TOKEN: ${{ github.token }} - # - name: Build with RELEASE130 # run: | # mvn -B clean deploy -Dnetbeans.release.version=RELEASE130 -Dnext.version=RELEASE130-${{ env.RELEASE_VERSION }} @@ -225,62 +214,93 @@ jobs: # env: # GITHUB_TOKEN: ${{ github.token }} - - name: Build with RELEASE210 - run: | - mvn -B clean deploy -Dnetbeans.release.version=RELEASE210 -Dnext.version=RELEASE210-${{ env.RELEASE_VERSION }} - echo "SIZE_20=$(wc -c target/nbm/python-RELEASE210-${{ env.RELEASE_VERSION }}.nbm | awk '{print $1}')" >> $GITHUB_ENV - env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} - GITHUB_TOKEN: ${{ github.token }} - - - name: Attach RELEASE210 NBM - uses: actions/upload-release-asset@v1 - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: target/nbm/python-RELEASE210-${{ env.RELEASE_VERSION }}.nbm - asset_name: python-RELEASE210-${{ env.RELEASE_VERSION }}.nbm - asset_content_type: application/gzip - env: - GITHUB_TOKEN: ${{ github.token }} +# - name: Build with RELEASE210 +# run: | +# mvn -B clean deploy -Dnetbeans.release.version=RELEASE210 -Dnext.version=RELEASE210-${{ env.RELEASE_VERSION }} +# echo "SIZE_20=$(wc -c target/nbm/python-RELEASE210-${{ env.RELEASE_VERSION }}.nbm | awk '{print $1}')" >> $GITHUB_ENV +# env: +# MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} +# MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} +# MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} +# GITHUB_TOKEN: ${{ github.token }} +# +# - name: Attach RELEASE210 NBM +# uses: actions/upload-release-asset@v1 +# with: +# upload_url: ${{ steps.create_release.outputs.upload_url }} +# asset_path: target/nbm/python-RELEASE210-${{ env.RELEASE_VERSION }}.nbm +# asset_name: python-RELEASE210-${{ env.RELEASE_VERSION }}.nbm +# asset_content_type: application/gzip +# env: +# GITHUB_TOKEN: ${{ github.token }} +# +# - name: Build with RELEASE220 +# run: | +# mvn -B clean deploy -Dnetbeans.release.version=RELEASE220 -Dnext.version=RELEASE220-${{ env.RELEASE_VERSION }} +# echo "SIZE_20=$(wc -c target/nbm/python-RELEASE220-${{ env.RELEASE_VERSION }}.nbm | awk '{print $1}')" >> $GITHUB_ENV +# env: +# MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} +# MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} +# MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} +# GITHUB_TOKEN: ${{ github.token }} +# +# - name: Attach RELEASE220 NBM +# uses: actions/upload-release-asset@v1 +# with: +# upload_url: ${{ steps.create_release.outputs.upload_url }} +# asset_path: target/nbm/python-RELEASE220-${{ env.RELEASE_VERSION }}.nbm +# asset_name: python-RELEASE220-${{ env.RELEASE_VERSION }}.nbm +# asset_content_type: application/gzip +# env: +# GITHUB_TOKEN: ${{ github.token }} +# +# - name: Build with RELEASE230 +# run: | +# mvn -B clean deploy -Dnetbeans.release.version=RELEASE230 -Dnext.version=RELEASE230-${{ env.RELEASE_VERSION }} +# echo "SIZE_20=$(wc -c target/nbm/python-RELEASE230-${{ env.RELEASE_VERSION }}.nbm | awk '{print $1}')" >> $GITHUB_ENV +# env: +# MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} +# MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} +# MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} +# GITHUB_TOKEN: ${{ github.token }} +# +# - name: Attach RELEASE230 NBM +# uses: actions/upload-release-asset@v1 +# with: +# upload_url: ${{ steps.create_release.outputs.upload_url }} +# asset_path: target/nbm/python-RELEASE230-${{ env.RELEASE_VERSION }}.nbm +# asset_name: python-RELEASE230-${{ env.RELEASE_VERSION }}.nbm +# asset_content_type: application/gzip +# env: +# GITHUB_TOKEN: ${{ github.token }} - - name: Build with RELEASE220 + - name: Build with RELEASE240 run: | - mvn -B clean deploy -Dnetbeans.release.version=RELEASE220 -Dnext.version=RELEASE220-${{ env.RELEASE_VERSION }} - echo "SIZE_20=$(wc -c target/nbm/python-RELEASE220-${{ env.RELEASE_VERSION }}.nbm | awk '{print $1}')" >> $GITHUB_ENV + mvn -B clean deploy -Dnetbeans.release.version=RELEASE240 -Dnext.version=RELEASE240-${{ env.RELEASE_VERSION }} + echo "SIZE_20=$(wc -c target/nbm/python-RELEASE240-${{ env.RELEASE_VERSION }}.nbm | awk '{print $1}')" >> $GITHUB_ENV env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} GITHUB_TOKEN: ${{ github.token }} - - name: Attach RELEASE220 NBM - uses: actions/upload-release-asset@v1 + - name: Create Release + uses: actions/create-release@v1 + id: create_release with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: target/nbm/python-RELEASE220-${{ env.RELEASE_VERSION }}.nbm - asset_name: python-RELEASE220-${{ env.RELEASE_VERSION }}.nbm - asset_content_type: application/gzip - env: - GITHUB_TOKEN: ${{ github.token }} - - - name: Build with RELEASE230 - run: | - mvn -B clean deploy -Dnetbeans.release.version=RELEASE230 -Dnext.version=RELEASE230-${{ env.RELEASE_VERSION }} - echo "SIZE_20=$(wc -c target/nbm/python-RELEASE230-${{ env.RELEASE_VERSION }}.nbm | awk '{print $1}')" >> $GITHUB_ENV + draft: false + prerelease: false + release_name: ${{ github.event.repository.name }} ${{ env.RELEASE_VERSION }} + tag_name: ${{ env.RELEASE_VERSION }} env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} GITHUB_TOKEN: ${{ github.token }} - - name: Attach RELEASE230 NBM + - name: Attach RELEASE240 NBM uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: target/nbm/python-RELEASE230-${{ env.RELEASE_VERSION }}.nbm - asset_name: python-RELEASE230-${{ env.RELEASE_VERSION }}.nbm + asset_path: target/nbm/python-RELEASE240-${{ env.RELEASE_VERSION }}.nbm + asset_name: python-RELEASE240-${{ env.RELEASE_VERSION }}.nbm asset_content_type: application/gzip env: GITHUB_TOKEN: ${{ github.token }} diff --git a/pom.xml b/pom.xml index 0d6f1ee..4eaa399 100644 --- a/pom.xml +++ b/pom.xml @@ -235,8 +235,8 @@ maven-compiler-plugin 3.11.0 - 11 - 11 + 17 + 17 true true true @@ -802,7 +802,7 @@ target/keystore RELEASE230 - 1.9.3 + 1.9.4 https://github.com/albilu/netbeansPython https://github.com/albilu/netbeansPython.git UTF-8 diff --git a/ppuc/24/updates.xml b/ppuc/24/updates.xml new file mode 100644 index 0000000..0dabe3f --- /dev/null +++ b/ppuc/24/updates.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file