diff --git a/.github/workflows/merge-build.yml b/.github/workflows/merge-build.yml index cd59c6a..bf3cae1 100644 --- a/.github/workflows/merge-build.yml +++ b/.github/workflows/merge-build.yml @@ -23,6 +23,7 @@ on: [push] jobs: publish-snapshot: + name: publish to oss sonatype & push image runs-on: ubuntu-latest @@ -30,17 +31,18 @@ jobs: contents: read packages: write + env: + MAVEN_OPTS: "-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m" + steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: - java-version: '11' - distribution: 'adopt' - # server-id: sonatype - # server-username: SONATYPE_BOT_USERNAME - # server-password: SONATYPE_BOT_TOKEN + distribution: 'temurin' + architecture: x64 + java-version: 11 - name: maven-settings-xml-action uses: whelk-io/maven-settings-xml-action@v14 @@ -49,12 +51,48 @@ jobs: repositories: '[{ "id": "sonatype", "url": "https://oss.sonatype.org/content/repositories/snapshots/", "releases": {"enabled": "false"}, "snapshots": {"enabled": "true" }}]' servers: '[{ "id": "sonatype", "username": "${{ secrets.SONATYPE_BOT_USERNAME}}", "password": "${{ secrets.SONATYPE_BOT_TOKEN}}" }]' + - name: "Maven Verify" + if: ${{ github.event.repository.fork == true }} + run: mvn -B -e verify + - name: "Maven Build & Deploy Snapshot to Sonatype OSSRH" if: ${{ github.event.repository.fork == false }} - run: mvn -B -e deploy -DaltDeploymentRepository=sonatype::default::https://oss.sonatype.org/content/repositories/snapshots/ - - name: "Maven Build" - if: ${{ github.event.repository.fork == true }} + - name: Checkout tools repo + uses: actions/checkout@v4 + with: + repository: Commonjava/commonjava-images + path: commonjava-images - run: mvn -B -e verify + - name: Locate artifacts + id: locate-artifacts + run: | + tarball=$(ls -d $PWD/target/*-runner.jar) + cp "$tarball" "commonjava-images/indy-repository-service/indy-repository-service-runner.jar" + + - name: Log in to Quay.io + uses: redhat-actions/podman-login@v1 + with: + username: ${{ secrets.QUAY_USERNAME }} + password: ${{ secrets.QUAY_ROBOT_TOKEN }} + registry: quay.io + + - name: Buildah build + id: buildah-build + uses: redhat-actions/buildah-build@v2 + with: + image: indy-repository-service + tags: ${{ github.ref_name }} + platforms: linux/amd64 + containerfiles: | + commonjava-images/indy-repository-service/actions.Dockerfile + context: commonjava-images/indy-repository-service/ + + - name: Push To quay.io + id: push-to-quay + uses: redhat-actions/push-to-registry@v2 + with: + image: ${{ steps.buildah-build.outputs.image }} + tags: ${{ steps.buildah-build.outputs.tags }} + registry: quay.io/factory2 \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile.bak similarity index 100% rename from Jenkinsfile rename to Jenkinsfile.bak