Merge pull request #2 from Smoothex/main

Project maintenance
iavofficial · May 29, 2024 · d587338 · d587338
2 parents 1ee8727 + c10d3d2
commit d587338
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 41 deletions.
diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
@@ -28,7 +28,7 @@ jobs:
       env:
         ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
         ECR_REPOSITORY: test
-        IMAGE_TAG: testtag
+        IMAGE_TAG: build-${{ github.run_id }}
       run: |
         docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
         docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
diff --git a/.github/workflows/tests.yml → .github/workflows/integration-tests.yml b/.github/workflows/tests.yml → .github/workflows/integration-tests.yml
@@ -1,4 +1,4 @@
-name: Unit and integration tests
+name: Integration tests
 
 on:
   push:
@@ -7,42 +7,7 @@ on:
     branches: [ "main" ]
 
 jobs:
-  unit-tests:
-    env:
-        POSTGRES_HOST: localhost
-        POSTGRES_PORT: 5432
-        POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
-        POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
-        POSTGRES_DB: routing
-        PYTHONFAULTHANDLER: 1
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
-      with:
-        lfs: true
-
-    - name: Checkout LFS objects (map files)
-      run: git lfs checkout
-
-    - name: Set up Python 3.9.16
-      uses: actions/setup-python@v3
-      with:
-        python-version: 3.9.16
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -e ./routing
-        pip install -r requirements.txt
-
-    - name: Run unit tests
-      run: |
-        cd routing
-        python -m unittest -v
-    
   integration-tests:
-    needs: [unit-tests]
     env:
         POSTGRES_HOST: localhost
         POSTGRES_PORT: 5432

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -0,0 +1,42 @@
+name: Unit tests
+
+on:
+  push:
+    branches: [ "*" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  unit-tests:
+    env:
+        POSTGRES_HOST: localhost
+        POSTGRES_PORT: 5432
+        POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
+        POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
+        POSTGRES_DB: routing
+        PYTHONFAULTHANDLER: 1
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+      with:
+        lfs: true
+
+    - name: Checkout LFS objects (map files)
+      run: git lfs checkout
+
+    - name: Set up Python 3.9.16
+      uses: actions/setup-python@v3
+      with:
+        python-version: 3.9.16
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -e ./routing
+        pip install -r requirements.txt
+
+    - name: Run unit tests
+      run: |
+        cd routing
+        python -m unittest -v
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
-![Unit and integration tests](https://github.com/Smoothex/erzmobil-routing/actions/workflows/tests.yml/badge.svg)
+[![Unit tests](https://github.com/Smoothex/erzmobil-routing/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/Smoothex/erzmobil-routing/actions/workflows/unit-tests.yml)
+[![Integration tests](https://github.com/Smoothex/erzmobil-routing/actions/workflows/integration-tests.yml/badge.svg)](https://github.com/Smoothex/erzmobil-routing/actions/workflows/integration-tests.yml)
+[![Build and push image to AWS ECR](https://github.com/Smoothex/erzmobil-routing/actions/workflows/build-and-push.yml/badge.svg)](https://github.com/Smoothex/erzmobil-routing/actions/workflows/build-and-push.yml)
 
-![Image build](https://github.com/Smoothex/erzmobil-routing/actions/workflows/build-and-push.yml/badge.svg)
-
-# bUSnow-routing
+# Routing component of Mobility platform
 
 In dieser Datei soll skizziert werden, wie die Entwicklung des Routing-Service abläuft (Stand 07/2023).