diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml index 975e601..b0c4bf9 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-tripupdate-processor-jar-with-dependencies.jar path: target/transitdata-tripupdate-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-tripupdate-processor-jar-with-dependencies.jar path: target @@ -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-tripupdate-processor-jar-with-dependencies.jar path: target @@ -60,3 +60,22 @@ jobs: 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@v3 + - name: Download .jar file + uses: actions/download-artifact@v4 + with: + name: transitdata-tripupdate-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-tripupdate-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 1f01a20..5d8043b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 fi.hsl.transitdata transitdata-tripupdate-processor - 1.2.0 + 2.0.0 jar @@ -16,7 +16,7 @@ UTF-8 11 11 - 1.6.1 + 2.0.1 1.17.6 diff --git a/src/main/resources/environment.conf b/src/main/resources/environment.conf index bd6e422..f851082 100644 --- a/src/main/resources/environment.conf +++ b/src/main/resources/environment.conf @@ -4,8 +4,8 @@ pulsar { consumer { multipleTopics=true multipleTopics=${?PULSAR_CONSUMER_ENABLE_MULTIPLE_TOPICS} - topicsPattern="persistent://public/default/(stop-estimates|cancellations|metro-ats-cancellations)" - topicsPattern=${?PULSAR_CONSUMER_MULTIPLE_TOPICS_PATTERN} + topics=["stop-estimates, cancellations, metro-ats-cancellations"] + topics=${?PULSAR_CONSUMER_TOPICS} subscription="trip-update-subscription" subscription=${?PULSAR_CONSUMER_SUBSCRIPTION} }