diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index f8cc168..e687e9f 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -6,20 +6,32 @@ on: - master jobs: - tests: + m-tests: uses: ./.github/workflows/tests.yml - tag: + release-on-push: + needs: m-tests runs-on: ubuntu-latest - needs: tests + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v2 + - uses: rymndhng/release-on-push-action@master with: - fetch-depth: '0' - - name: Bump version and push tag - uses: anothrNick/github-tag-action@1.36.0 + bump_version_scheme: patch + + publish: + needs: m-tests + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + java-version: '8' + distribution: 'adopt' + - name: Publish package + run: mvn -DskipTests --batch-mode deploy env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - WITH_V: true - VERBOSE: true - DEFAULT_BUMP: patch \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index ccc11a6..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: release - -on: - push: - tags: - - "*" - -jobs: - tagged-release: - name: Tagged Release - runs-on: ubuntu-latest - steps: - - uses: marvinpinto/action-automatic-releases@latest - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - prerelease: false - - publish: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - java-version: '8' - distribution: 'adopt' - - name: Publish package - run: mvn --batch-mode deploy - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7392b8c..6094f45 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 8 uses: actions/setup-java@v3 with: java-version: '8' diff --git a/pom.xml b/pom.xml index db330e6..abb6ccf 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ com.ing.ranger ranger-s3-plugin - 0.4 + v0.1.0 UTF-8 @@ -65,7 +65,6 @@ test ${assertj.version} - @@ -196,4 +195,11 @@ + + + github + GitHub Packages + https://maven.pkg.github.com/ing-bank/apache-ranger-s3-plugin + + \ No newline at end of file