From 8168bb0c3e7373f458de31dcebdadd8e15fd0b54 Mon Sep 17 00:00:00 2001 From: Alan <70740609+roalkl@users.noreply.github.com> Date: Fri, 5 Dec 2025 17:45:22 +0000 Subject: [PATCH 1/2] Release 28 --- .github/workflows/builds.yml | 12 +++++-- .github/workflows/maven.yml | 65 +++++++++++++++++++++++++++++------- pom.xml | 4 +-- ppuc/28/updates.xml | 6 ++++ 4 files changed, 70 insertions(+), 17 deletions(-) create mode 100644 ppuc/28/updates.xml diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 6f81984..0ba5a52 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -107,9 +107,15 @@ jobs: # mvn -B clean install -P dev -Dnetbeans.release.version=RELEASE260 -Dnext.version=RELEASE260 # env: # GITHUB_TOKEN: ${{ github.token }} - - - name: Build with RELEASE270 +# +# - name: Build with RELEASE270 +# run: | +# mvn -B clean install -P dev -Dnetbeans.release.version=RELEASE270 -Dnext.version=RELEASE270 +# env: +# GITHUB_TOKEN: ${{ github.token }} +# + - name: Build with RELEASE280 run: | - mvn -B clean install -P dev -Dnetbeans.release.version=RELEASE270 -Dnext.version=RELEASE270 + mvn -B clean install -P dev -Dnetbeans.release.version=RELEASE280 -Dnext.version=RELEASE280 env: GITHUB_TOKEN: ${{ github.token }} \ No newline at end of file diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0cb87f1..0bf67ce 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -366,16 +366,47 @@ jobs: # asset_content_type: application/gzip # env: # GITHUB_TOKEN: ${{ github.token }} - - - name: Build with RELEASE270 - run: | - mvn -B clean deploy -Dnetbeans.release.version=RELEASE270 -Dnext.version=${{ env.RELEASE_VERSION }} - echo "SIZE_20=$(wc -c target/nbm/python-${{ 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: Build with RELEASE270 +# run: | +# mvn -B clean deploy -Dnetbeans.release.version=RELEASE270 -Dnext.version=${{ env.RELEASE_VERSION }} +# echo "SIZE_20=$(wc -c target/nbm/python-${{ 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: Create Release +# uses: actions/create-release@v1 +# id: create_release +# with: +# draft: false +# prerelease: false +# release_name: ${{ github.event.repository.name }} RELEASE270 ${{ env.RELEASE_VERSION }} +# tag_name: ${{ env.RELEASE_VERSION }} +# env: +# GITHUB_TOKEN: ${{ github.token }} +# +# - name: Attach RELEASE280 NBM +# uses: actions/upload-release-asset@v1 +# with: +# upload_url: ${{ steps.create_release.outputs.upload_url }} +# asset_path: target/nbm/python-${{ env.RELEASE_VERSION }}.nbm +# asset_name: python-${{ env.RELEASE_VERSION }}.nbm +# asset_content_type: application/gzip +# env: +# GITHUB_TOKEN: ${{ github.token }} +# +# - name: Build with RELEASE270 +# run: | +# mvn -B clean deploy -Dnetbeans.release.version=RELEASE270 -Dnext.version=${{ env.RELEASE_VERSION }} +# echo "SIZE_20=$(wc -c target/nbm/python-${{ 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: Create Release uses: actions/create-release@v1 @@ -383,12 +414,12 @@ jobs: with: draft: false prerelease: false - release_name: ${{ github.event.repository.name }} RELEASE270 ${{ env.RELEASE_VERSION }} + release_name: ${{ github.event.repository.name }} RELEASE280 ${{ env.RELEASE_VERSION }} tag_name: ${{ env.RELEASE_VERSION }} env: GITHUB_TOKEN: ${{ github.token }} - - name: Attach RELEASE270 NBM + - name: Attach RELEASE280 NBM uses: actions/upload-release-asset@v1 with: upload_url: ${{ steps.create_release.outputs.upload_url }} @@ -398,6 +429,16 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} + - name: Build with RELEASE280 + run: | + mvn -B clean deploy -Dnetbeans.release.version=RELEASE280 -Dnext.version=${{ env.RELEASE_VERSION }} + echo "SIZE_20=$(wc -c target/nbm/python-${{ 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 }} + #TODO # - name: Update PPUCs # id: my_string diff --git a/pom.xml b/pom.xml index b4c6268..b88be8a 100644 --- a/pom.xml +++ b/pom.xml @@ -811,8 +811,8 @@ target/keystore - RELEASE270 - 1.9.7 + RELEASE280 + 1.9.8 https://github.com/albilu/netbeansPython https://github.com/albilu/netbeansPython.git UTF-8 diff --git a/ppuc/28/updates.xml b/ppuc/28/updates.xml new file mode 100644 index 0000000..d63443c --- /dev/null +++ b/ppuc/28/updates.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From cf97204134306cedbbeb198f1cee28ec05267659 Mon Sep 17 00:00:00 2001 From: Alan <70740609+roalkl@users.noreply.github.com> Date: Fri, 5 Dec 2025 17:51:24 +0000 Subject: [PATCH 2/2] Release 28 --- .github/workflows/builds.yml | 2 +- .github/workflows/maven.yml | 31 +++++++++++-------------------- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 0ba5a52..ff9d201 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -118,4 +118,4 @@ jobs: run: | mvn -B clean install -P dev -Dnetbeans.release.version=RELEASE280 -Dnext.version=RELEASE280 env: - GITHUB_TOKEN: ${{ github.token }} \ No newline at end of file + GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0bf67ce..84b7cbc 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -396,18 +396,19 @@ jobs: # asset_name: python-${{ env.RELEASE_VERSION }}.nbm # asset_content_type: application/gzip # env: -# GITHUB_TOKEN: ${{ github.token }} -# -# - name: Build with RELEASE270 -# run: | -# mvn -B clean deploy -Dnetbeans.release.version=RELEASE270 -Dnext.version=${{ env.RELEASE_VERSION }} -# echo "SIZE_20=$(wc -c target/nbm/python-${{ 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: Build with RELEASE280 + run: | + mvn -B clean deploy -Dnetbeans.release.version=RELEASE280 -Dnext.version=${{ env.RELEASE_VERSION }} + echo "SIZE_20=$(wc -c target/nbm/python-${{ 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: Create Release uses: actions/create-release@v1 id: create_release @@ -429,16 +430,6 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} - - name: Build with RELEASE280 - run: | - mvn -B clean deploy -Dnetbeans.release.version=RELEASE280 -Dnext.version=${{ env.RELEASE_VERSION }} - echo "SIZE_20=$(wc -c target/nbm/python-${{ 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 }} - #TODO # - name: Update PPUCs # id: my_string