diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aa937c9..c547d94 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,6 +5,10 @@ on: release: types: [created] +env: + CONFIG_PROPERTIES: ./src/test/resources/config.properties + CONFIG_PROPERTIES_SAMPLE: ./src/test/resources/config.properties.sample + jobs: release: @@ -39,7 +43,7 @@ jobs: java-version: '8' distribution: 'temurin' cache: maven - server-id: ossrh + server-id: central server-username: OSSRH_USERNAME server-password: OSSRH_TOKEN gpg-passphrase: GPG_PASSPHRASE @@ -56,8 +60,17 @@ jobs: sed -i 's/^IBMI_PASSWORD=/IBMI_PASSWORD=${{ secrets.IBMI_PASSWORD }}/' ${{ env.CONFIG_PROPERTIES }} sed -i 's/^IBMI_PORT=/IBMI_PORT=${{ secrets.IBMI_PORT }}/' ${{ env.CONFIG_PROPERTIES }} + - name: remove test dir + run: rm -fr src/test + - name: eyeball settings.xml + run: cat $HOME/.m2/settings.xml + - name: Publish Maven Package - run: mvn -B clean deploy --file pom.xml + run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} clean deploy --file pom.xml + env: + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: List Target Directory run: ls -l target @@ -66,30 +79,38 @@ jobs: run: mkdir staging && cp target/*.jar staging - name: Create Bundle .zip - run: cd staging && zip mapapire-java-${{ env.PROJECT_VERSION }}.zip *.jar && cd .. - - - name: Get Release - id: get_release - uses: bruceadams/get-release@v1.3.2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Upload JAR to Release - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.get_release.outputs.upload_url }} - asset_path: ./mapapire-java-${{ env.PROJECT_VERSION }}.jar - asset_name: mapapire-java-${{ env.PROJECT_VERSION }}.jar - asset_content_type: application/zip - - - name: Upload ZIP to Release - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: cd staging && zip ../mapepire-java-${{ env.PROJECT_VERSION }}.zip *.jar && cd .. + + # - name: Get Release + # id: get_release + # uses: bruceadams/get-release@v1.3.2 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + # - name: Upload JAR to Release + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # upload_url: ${{ steps.get_release.outputs.upload_url }} + # asset_path: ./mapepire-java-${{ env.PROJECT_VERSION }}.jar + # asset_name: mapepire-java-${{ env.PROJECT_VERSION }}.jar + # asset_content_type: application/zip + + # - name: Upload ZIP to Release + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # upload_url: ${{ steps.get_release.outputs.upload_url }} + # asset_path: ./mapepire-java-${{ env.PROJECT_VERSION }}.zip + # asset_name: mapepire-java-${{ env.PROJECT_VERSION }}.zip + # asset_content_type: application/zip + + - name: Create the tag and release + uses: softprops/action-gh-release@v1 with: - upload_url: ${{ steps.get_release.outputs.upload_url }} - asset_path: ./mapapire-java-${{ env.PROJECT_VERSION }}.zip - asset_name: mapapire-java-${{ env.PROJECT_VERSION }}.zip - asset_content_type: application/zip \ No newline at end of file + tag_name: v${{ env.PROJECT_VERSION }} + name: v${{ env.PROJECT_VERSION }} + files: | + mapepire-java-${{ env.PROJECT_VERSION }}.zip \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3386b52..94eb24d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - io.github.mapapire-ibmi - mapapire-sdk - 1.0-SNAPSHOT + io.github.mapepire-ibmi + mapepire-sdk + 0.0.2 jar Mapepire Java @@ -41,17 +41,6 @@ https://github.com/Mapepire-IBMi/mapepire-java - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - 1.8 1.8 @@ -261,17 +250,16 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - true - - ossrh - https://s01.oss.sonatype.org/ - true - - + + org.sonatype.central + central-publishing-maven-plugin + 0.5.0 + true + + central + true + +