small fixes

ghga-de · May 28, 2024 · 3dd5208 · 3dd5208
1 parent 1856219
commit 3dd5208
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/ci_docker.yaml b/.github/workflows/ci_docker.yaml
@@ -34,6 +34,7 @@ jobs:
 
   push-to-docker:
     runs-on: ubuntu-latest
+    if: ${{ needs.get-changed-services.outputs.services != '' }}
     needs: get-changed-services
     strategy:
       matrix:

diff --git a/.github/workflows/tests_on_push.yaml → .github/workflows/run_tests.yaml b/.github/workflows/tests_on_push.yaml → .github/workflows/run_tests.yaml
@@ -1,10 +1,15 @@
-name: Monorepo Push Tests
+name: Run tests on non main branch
 
 on:
   push:
     branches-ignore:
       - main
 
+env:
+  IFRS_CONFIG_YAML: ./services/ifrs/dev_config.yaml
+  IRS_CONFIG_YAML: ./services/irs/dev_config.yaml
+  PCS_CONFIG_YAML: ./services/pcs/dev_config.yaml
+
 jobs:
   get-changed-services:
     uses: ./.github/workflows/get_affected_services.yaml
@@ -18,11 +23,6 @@ jobs:
         service: ${{ fromJson(needs.get-changed-services.outputs.services) }}
       fail-fast: false
 
-    env:
-      IFRS_CONFIG_YAML: ./services/ifrs/dev_config.yaml
-      IRS_CONFIG_YAML: ./services/irs/dev_config.yaml
-      PCS_CONFIG_YAML: ./services/pcs/dev_config.yaml
-
     steps:
       - name: Checkout ${{matrix.service}}
         uses: actions/checkout@v4

diff --git a/scripts/check_license.py b/scripts/check_license.py
@@ -292,7 +292,7 @@ def validate_year_string(year_string: str, min_year: int = MIN_YEAR) -> bool:
         return int(year_string) == current_year
 
     # Otherwise, a range (e.g. 2021 - 2023) is expected:
-    match = re.match("(\d+) - (\d+)", year_string)
+    match = re.match(r"(\d+) - (\d+)", year_string)
 
     if not match:
         return False

diff --git a/services/irs/tests_irs/test_event_handling.py b/services/irs/tests_irs/test_event_handling.py
@@ -156,7 +156,7 @@ async def test_failure_event(monkeypatch, joint_fixture: JointFixture):
 
     assert len(recorded_events) == 1
     assert recorded_events[0].payload["object_id"] != ""
-    expected_event_out.payload["object_id"] = recorded_events[0].payload["object_id"]
+    expected_event_out.payload["object_id"] = recorded_events[0].payload["object_id"]  # type: ignore[index]
     assert recorded_events[0].payload == expected_event_out.payload
 
     # check staging object dao state
@@ -246,7 +246,7 @@ async def test_success_event(monkeypatch, joint_fixture: JointFixture):
     assert len(recorded_events) == 1
     event = recorded_events[0]
 
-    expected_event_out.payload["object_id"] = event.payload["object_id"]
+    expected_event_out.payload["object_id"] = event.payload["object_id"]  # type: ignore[index]
     for key in payload_out:
         assert event.payload[key] == expected_event_out.payload[key]