Merge pull request #6 from 01Joseph-Hwang10/ci-test

01Joseph-Hwang10 · web-flow · commit 9fa8878cd95e · 2024-03-02T02:16:55.000+09:00
Ci test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -50,7 +50,7 @@ jobs:
 
       # Install dependencies
       - if: ${{ steps.release.outputs.release_created == 'true' && steps.cache-dependencies.outputs.cache-hit != 'true' }}
-        run: poetry install
+        run: poetry install --all-extras
 
       # Configure basic credentials for PyPI
       - run: poetry config pypi-token.pypi "${{ secrets.PYPI_PASSWORD }}"
diff --git a/.github/workflows/test-and-lint.yml b/.github/workflows/test-and-lint.yml
@@ -27,22 +27,10 @@ jobs:
 
       - id: install-dependencies
         if: ${{ steps.cache-dependencies.outputs.cache-hit != 'true' }}
-        run: poetry install
+        run: poetry install --all-extras
 
       - id: install-jtd-codegen
-        run: |
-          # Download and unpack jtd-codegen
-          jtd_codegen_archive_url=$(curl https://api.github.com/repos/jsontypedef/json-typedef-codegen/releases | jq '.[0].assets.[] | select(.name | test("linux-gnu"))' | jq -r '.browser_download_url')
-          wget $jtd_codegen_archive_url -O jtd-codegen.zip
-          unzip jtd-codegen.zip
-
-          # Install jtd-codegen
-          chmod +x jtd-codegen
-          mv jtd-codegen .jtd-codegen/jtd-codegen
-          export PATH=$PATH:$(pwd)/.jtd-codegen
-
-          # Clean up
-          rm -f jtd-codegen.zip
+        run: source ./ci/install-jtd-codegen
 
       - run: poetry run poe test jtd_codebuild/tests
 
@@ -66,7 +54,7 @@ jobs:
           key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
 
       - if: ${{ steps.cache-dependencies.outputs.cache-hit != 'true' }}
-        run: poetry install
+        run: poetry install --all-extras
 
       - run: poetry run poe lint
 
@@ -90,6 +78,6 @@ jobs:
           key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
 
       - if: ${{ steps.cache-dependencies.outputs.cache-hit != 'true' }}
-        run: poetry install
+        run: poetry install --all-extras
 
       - run: poetry run poe check-format
diff --git a/ci/install-jtd-codegen b/ci/install-jtd-codegen
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Download and unpack jtd-codegen
+jtd_codegen_archive_url=$(curl https://api.github.com/repos/jsontypedef/json-typedef-codegen/releases | jq '.[0].assets' | jq '.[] | select(.name | test("linux-gnu"))' | jq -r '.browser_download_url')
+wget $jtd_codegen_archive_url -O jtd-codegen.zip
+unzip jtd-codegen.zip
+
+# Install jtd-codegen
+chmod +x jtd-codegen
+mkdir -p .jtd-codegen
+mv jtd-codegen .jtd-codegen/jtd-codegen
+echo "$(pwd)/.jtd-codegen" >> $GITHUB_PATH
+
+# Clean up
+rm -f jtd-codegen.zip
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -21,6 +21,7 @@ poethepoet = "^0.24.4"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.3"
+pydantic = "^2.6.3"
 
 
 [tool.poetry.scripts]
