From 73967613f0c8ffa73277d701fcb185ef1fafe669 Mon Sep 17 00:00:00 2001 From: Eric Park Date: Sun, 16 Jul 2023 15:33:47 +0900 Subject: [PATCH] refactor: finish move to monorepo --- .github/dependabot.yml | 9 ++++-- .github/workflows/server-docker-image.yml | 2 +- .github/workflows/shippy-pypi-publish.yml | 31 +++++++++++++++++++ {.idea => server/.idea}/.gitignore | 0 .../.idea}/codeStyles/codeStyleConfig.xml | 0 .../inspectionProfiles/profiles_settings.xml | 0 {.idea => server/.idea}/misc.xml | 0 {.idea => server/.idea}/modules.xml | 0 {.idea => server/.idea}/scopes/Project.xml | 0 {.idea => server/.idea}/shipper.iml | 0 {.idea => server/.idea}/vcs.xml | 0 shippy | 1 + 12 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/shippy-pypi-publish.yml rename {.idea => server/.idea}/.gitignore (100%) rename {.idea => server/.idea}/codeStyles/codeStyleConfig.xml (100%) rename {.idea => server/.idea}/inspectionProfiles/profiles_settings.xml (100%) rename {.idea => server/.idea}/misc.xml (100%) rename {.idea => server/.idea}/modules.xml (100%) rename {.idea => server/.idea}/scopes/Project.xml (100%) rename {.idea => server/.idea}/shipper.iml (100%) rename {.idea => server/.idea}/vcs.xml (100%) create mode 160000 shippy diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c0cc90ca..c12d3beb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -2,9 +2,14 @@ version: 2 updates: - # Maintain dependencies for Python packages + # Maintain dependencies for server Python packages - package-ecosystem: "pip" - directory: "/" + directory: "./server" + schedule: + interval: "daily" + # Maintain dependencies for shippy Python packages + - package-ecosystem: "pip" + directory: "./shippy" schedule: interval: "daily" # Maintain dependencies for GitHub Actions diff --git a/.github/workflows/server-docker-image.yml b/.github/workflows/server-docker-image.yml index 309f6870..70d669a0 100644 --- a/.github/workflows/server-docker-image.yml +++ b/.github/workflows/server-docker-image.yml @@ -35,7 +35,7 @@ jobs: - name: Build and push uses: docker/build-push-action@v4 with: - context: ./backend + context: ./server push: true tags: ${{ steps.metadata.outputs.tags }} labels: ${{ steps.metadata.outputs.labels }} diff --git a/.github/workflows/shippy-pypi-publish.yml b/.github/workflows/shippy-pypi-publish.yml new file mode 100644 index 00000000..338be882 --- /dev/null +++ b/.github/workflows/shippy-pypi-publish.yml @@ -0,0 +1,31 @@ +# This workflow will upload a Python Package using Twine when a release is created +# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries + +name: Upload shippy Python package to PyPI + +on: + push: + tags: + - '*.*.*' + +jobs: + deploy: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v4.6.0 + with: + python-version: '3.x' + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install setuptools wheel twine + - name: Build and publish + working-directory: ./shippy + env: + TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} + TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + run: ./release.sh diff --git a/.idea/.gitignore b/server/.idea/.gitignore similarity index 100% rename from .idea/.gitignore rename to server/.idea/.gitignore diff --git a/.idea/codeStyles/codeStyleConfig.xml b/server/.idea/codeStyles/codeStyleConfig.xml similarity index 100% rename from .idea/codeStyles/codeStyleConfig.xml rename to server/.idea/codeStyles/codeStyleConfig.xml diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/server/.idea/inspectionProfiles/profiles_settings.xml similarity index 100% rename from .idea/inspectionProfiles/profiles_settings.xml rename to server/.idea/inspectionProfiles/profiles_settings.xml diff --git a/.idea/misc.xml b/server/.idea/misc.xml similarity index 100% rename from .idea/misc.xml rename to server/.idea/misc.xml diff --git a/.idea/modules.xml b/server/.idea/modules.xml similarity index 100% rename from .idea/modules.xml rename to server/.idea/modules.xml diff --git a/.idea/scopes/Project.xml b/server/.idea/scopes/Project.xml similarity index 100% rename from .idea/scopes/Project.xml rename to server/.idea/scopes/Project.xml diff --git a/.idea/shipper.iml b/server/.idea/shipper.iml similarity index 100% rename from .idea/shipper.iml rename to server/.idea/shipper.iml diff --git a/.idea/vcs.xml b/server/.idea/vcs.xml similarity index 100% rename from .idea/vcs.xml rename to server/.idea/vcs.xml diff --git a/shippy b/shippy new file mode 160000 index 00000000..d5c35dcd --- /dev/null +++ b/shippy @@ -0,0 +1 @@ +Subproject commit d5c35dcd1234821576964ce4bdfd6971778294c8