diff --git a/.github/workflows/push-trigger.yml b/.github/workflows/push-trigger.yml index 07142d23..6d788e4e 100644 --- a/.github/workflows/push-trigger.yml +++ b/.github/workflows/push-trigger.yml @@ -52,9 +52,40 @@ jobs: uses: mosip/kattu/.github/workflows/npm-sonar-analysis.yml@master with: SERVICE_LOCATION: admin-ui - SONAR_URL: 'https://sonarcloud.io' - PROJECT_KEY: 'mosip_${{ github.event.repository.name }}' secrets: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} ORG_KEY: ${{ secrets.ORG_KEY }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + + build-maven-admintest: + uses: mosip/kattu/.github/workflows/maven-build.yml@master + with: + SERVICE_LOCATION: ./admintest + BUILD_ARTIFACT: admintest + secrets: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }} + OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }} + GPG_SECRET: ${{ secrets.GPG_SECRET }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + + build-docker-admintest: + needs: build-maven-admintest + strategy: + matrix: + include: + - SERVICE_LOCATION: 'admintest' + SERVICE_NAME: 'admintest' + BUILD_ARTIFACT: 'admintest' + fail-fast: false + name: ${{ matrix.SERVICE_NAME }} + uses: mosip/kattu/.github/workflows/docker-build.yml@master + with: + SERVICE_LOCATION: ${{ matrix.SERVICE_LOCATION }} + SERVICE_NAME: ${{ matrix.SERVICE_NAME }} + BUILD_ARTIFACT: ${{ matrix.BUILD_ARTIFACT }} + secrets: + DEV_NAMESPACE_DOCKER_HUB: ${{ secrets.DEV_NAMESPACE_DOCKER_HUB }} + ACTOR_DOCKER_HUB: ${{ secrets.ACTOR_DOCKER_HUB }} + RELEASE_DOCKER_HUB: ${{ secrets.RELEASE_DOCKER_HUB }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} \ No newline at end of file diff --git a/.github/workflows/release-changes.yml b/.github/workflows/release-changes.yml index 440e2e24..783d4896 100644 --- a/.github/workflows/release-changes.yml +++ b/.github/workflows/release-changes.yml @@ -24,3 +24,6 @@ jobs: RELEASE_TAG: ${{ inputs.RELEASE_TAG }} SNAPSHOT_TAG: ${{ inputs.SNAPSHOT_TAG }} BASE: ${{ inputs.BASE }} + secrets: + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + ACTION_PAT: ${{ secrets.ACTION_PAT }} \ No newline at end of file diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 73c55b03..9a5b079f 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -30,4 +30,6 @@ jobs: TAG: ${{ inputs.TAG }} BODY: ${{ inputs.BODY }} PRE_RELEASE: ${{ inputs.PRE_RELEASE }} - DRAFT: ${{ inputs.DRAFT }} \ No newline at end of file + DRAFT: ${{ inputs.DRAFT }} + secrets: + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} \ No newline at end of file diff --git a/admintest/Dockerfile b/admintest/Dockerfile index df0e7082..0c8f0748 100644 --- a/admintest/Dockerfile +++ b/admintest/Dockerfile @@ -32,7 +32,7 @@ RUN groupadd -g ${container_user_gid} ${container_user_group} \ USER ${container_user_uid}:${container_user_gid} COPY --chown=${container_user_uid}:${container_user} --chmod=771 ./entrypoint.sh ${work_dir}/entrypoint.sh -COPY --chown=${container_user}:${container_user} ./build_files/ ${work_dir} +COPY --chown=${container_user}:${container_user} ./src/main/resources/ ${work_dir} # set working directory WORKDIR ${work_dir} diff --git a/admintest/pom.xml b/admintest/pom.xml index eaa4252f..fec0403a 100644 --- a/admintest/pom.xml +++ b/admintest/pom.xml @@ -192,6 +192,51 @@ + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + pl.project13.maven + git-commit-id-plugin + 3.0.1 + + + get-the-git-infos + + revision + + validate + + + + true + ${project.build.outputDirectory}/git.properties + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + full + ${project.basedir}/.git + + + maven-compiler-plugin 3.5.1 @@ -201,7 +246,28 @@ -Dfile.encoding=UTF-8 - + + + org.apache.maven.plugins + maven-antrun-plugin + 3.0.0 + + + make-jar-executable + package + + run + + + + + + + + + + + pl.project13.maven git-commit-id-plugin