Merge branch 'main' into prod

noi-techpark · Aug 8, 2024 · 7a73806 · 7a73806
2 parents afe3733 + a73b02d
commit 7a73806
Show file tree

Hide file tree

Showing 119 changed files with 1,324 additions and 5,014 deletions.
diff --git a/.env.example b/.env.example
diff --git a/.github/workflows/ci-carpooling.yml b/.github/workflows/ci-carpooling.yml
@@ -11,7 +11,7 @@ env:
   PROJECT_NAME: odh-mobility-dc-carpooling
   DOCKER_IMAGE: ghcr.io/${{ github.repository }}/odh-mobility-dc-carpooling
   DOCKER_TAG: ${{ github.sha }}
-  JAVA_VERSION: '8'
+  JAVA_VERSION: '17'
   GOOGLE_API_SERVICE_ACCOUNT: ${{ secrets.GOOGLE_API_SERVICE_ACCOUNT }}
 
 jobs:
@@ -70,6 +70,10 @@ jobs:
           X_GOOGLE_API_DRIVE_FILE_ID: 1HzmEq-XB4dJEFlb0MAeupS3LRUXf86eI
           X_GOOGLE_API_CREDENTIALS_FILE: /google-api-service-account.json
 
+          # OTP amarillo config
+          X_AMARILLO_URL: https://amarillo.otp.opendatahub.testingmachine.eu/agency/ummadum/sync
+          X_AMARILLO_SECRET: ${{ secrets.CARPOOLING_AMARILLO_SECRET_TEST }}
+
           X_SCHEDULER_CRON_CAR_POOLING: 0 */10 * * * *
 
       - name: Create google service account json
@@ -142,6 +146,10 @@ jobs:
   #         X_GOOGLE_API_DRIVE_FILE_ID: 1HzmEq-XB4dJEFlb0MAeupS3LRUXf86eI
   #         X_GOOGLE_API_CREDENTIALS_FILE: /google-api-service-account.json
 
+  #         # OTP amarillo config
+  #         X_AMARILLO_URL: https://amarillo.otp.opendatahub.testingmachine.eu/agency/ummadum/sync
+  #         X_AMARILLO_SECRET: ${{ secrets.CARPOOLING_AMARILLO_SECRET_TEST }}
+
   #         X_SCHEDULER_CRON_CAR_POOLING: 0 */10 * * * *
 
   #     - name: Create google service account json

diff --git a/.github/workflows/ci-emobility-echarging-nevicam.yml b/.github/workflows/ci-emobility-echarging-nevicam.yml