Fix build error #24

tarosky · Oct 2, 2024 · a3faa2d · a3faa2d
1 parent 1690032
commit a3faa2d
Show file tree

Hide file tree

Showing 7 changed files with 373 additions and 199 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,6 +28,8 @@ jobs:
     - uses: actions/setup-python@main
       with:
         python-version: '~${{env.PYTHON_VERSION}}'
+    - name: Python Poetry Action
+      uses: abatilo/actions-poetry@main
     - run: script/recreate-venv
     - name: Generate build number
       uses: onyxmueller/build-tag-number@main
@@ -66,27 +68,30 @@ jobs:
     - uses: actions/setup-python@main
       with:
         python-version: '~${{env.PYTHON_VERSION}}'
+    - name: Python Poetry Action
+      uses: abatilo/actions-poetry@main
     - run: echo "$TEST_ACCESS_KEY_ID" > config/test/access-key-id
     - run: echo "$AWS_ACCOUNT_ID" > config/test/aws-account-id
     - run: echo "$TEST_GENERATED_BUCKET" > config/test/generated-bucket
     - run: echo "$TEST_ORIGINAL_BUCKET" > config/test/original-bucket
     - run: echo "$TEST_SECRET_ACCESS_KEY" > config/test/secret-access-key
       env:
         TEST_SECRET_ACCESS_KEY: ${{secrets.TEST_AWS_SECRET_ACCESS_KEY}}
-    - run: pip install -r requirements.txt
-    - run: python -m xmlrunner --output-file work/report.xml src/origin/request/test_index.py 2>&1
+    - run: poetry install --sync
+    - run: poetry run python -m xmlrunner --output-file ../../work/report-origin-request.xml originrequest/test_index.py 2>&1
+      working-directory: src/origin-request
     - name: Publish Unit Test Results
-      uses: EnricoMi/publish-unit-test-result-action@v2
+      uses: EnricoMi/publish-unit-test-result-action@main
       if: always()
       with:
-        files: work/report.xml
+        files: work/report-origin-request.xml
 
   release:
     needs:
     - build
     - test
     if: github.ref == 'refs/heads/master'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/download-artifact@main
       with:

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -15,7 +15,6 @@ autopep8 = "*"
 flake8 = "*"
 isort = "*"
 pep8 = "*"
-unittest-xml-reporting = "^3.2.0"
 yapf = "*"
 
 [build-system]

diff --git a/src/origin-request/poetry.lock b/src/origin-request/poetry.lock
diff --git a/src/origin-request/pyproject.toml b/src/origin-request/pyproject.toml
@@ -25,6 +25,7 @@ mypy = "^1.11.2"
 pep8 = "*"
 types-python-dateutil = "^2.9.0.20240906"
 types-pytz = "*"
+unittest-xml-reporting = "^3.2.0"
 
 [build-system]
 requires = ["poetry-core"]

diff --git a/src/origin-response/poetry.lock b/src/origin-response/poetry.lock
diff --git a/src/origin-response/pyproject.toml b/src/origin-response/pyproject.toml
@@ -15,6 +15,7 @@ autopep8 = "*"
 flake8 = "*"
 mypy = "^1.11.2"
 pep8 = "*"
+unittest-xml-reporting = "^3.2.0"
 
 [build-system]
 requires = ["poetry-core"]