diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml index 11964fc..a801eec 100644 --- a/.github/workflows/test-and-build.yml +++ b/.github/workflows/test-and-build.yml @@ -18,7 +18,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload .jar file - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: transitdata-alert-processor-jar-with-dependencies.jar path: target/transitdata-alert-processor-jar-with-dependencies.jar @@ -30,7 +30,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Download .jar file - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: transitdata-alert-processor-jar-with-dependencies.jar path: target @@ -38,8 +38,8 @@ jobs: uses: elgohr/Publish-Docker-Github-Action@master with: name: hsldevcom/transitdata-alert-processor - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + username: ${{ secrets.TRANSITDATA_DOCKERHUB_USER }} + password: ${{ secrets.TRANSITDATA_DOCKERHUB_TOKEN }} tags: develop build-release-docker-image: needs: test @@ -49,7 +49,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Download .jar file - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: transitdata-alert-processor-jar-with-dependencies.jar path: target @@ -57,6 +57,25 @@ jobs: uses: elgohr/Publish-Docker-Github-Action@master with: name: hsldevcom/transitdata-alert-processor - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - tag_semver: true \ No newline at end of file + username: ${{ secrets.TRANSITDATA_DOCKERHUB_USER }} + password: ${{ secrets.TRANSITDATA_DOCKERHUB_TOKEN }} + tag_semver: true + build-aks-dev-docker-image: + needs: test + runs-on: ubuntu-latest + # Run only on aks-dev branch + if: github.ref == 'refs/heads/aks-dev' + steps: + - uses: actions/checkout@v2 + - name: Download .jar file + uses: actions/download-artifact@v4 + with: + name: transitdata-alert-processor-jar-with-dependencies.jar + path: target + - name: Build and publish aks-dev Docker image + uses: elgohr/Publish-Docker-Github-Action@master + with: + name: hsldevcom/transitdata-alert-processor + username: ${{ secrets.TRANSITDATA_DOCKERHUB_USER }} + password: ${{ secrets.TRANSITDATA_DOCKERHUB_TOKEN }} + tags: aks-dev \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3531fc0..8566c1d 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 fi.hsl.transitdata transitdata-alert-processor - 1.0.8 + 2.0.0 jar @@ -16,7 +16,7 @@ UTF-8 11 11 - 1.5.2 + 2.0.1