Skip to content

Commit ab05b8d

Browse files
committed
Simplify project (no monorepo)
1 parent ce003e7 commit ab05b8d

File tree

72 files changed

+94
-220
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+94
-220
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Deploy API
1+
name: Deploy
22

33
on:
44
workflow_call:

.github/workflows/_deploy_transcriber.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/pull_request.yaml

Lines changed: 18 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
if: github.actor != 'dependabot[bot]'
1515
runs-on: ubuntu-latest
1616
outputs:
17-
api-docker-tag: ${{ steps.api-docker-tag.outputs.api-docker-tag }}
17+
python-archetype-docker-tag: ${{ steps.python-archetype-docker-tag.outputs.python-archetype-docker-tag }}
1818
env:
1919
COMMON__ENVIRONMENT: Development
2020
steps:
@@ -51,58 +51,37 @@ jobs:
5151
- name: Set up Docker Buildx
5252
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
5353

54-
- name: Set api docker tag
55-
id: api-docker-tag
56-
run: echo "api-docker-tag=myregistry/api:${{ github.event.pull_request.head.sha }}" >> $GITHUB_OUTPUT
54+
- name: Set docker tag
55+
id: python-archetype-docker-tag
56+
run: echo "python-archetype-docker-tag=myregistry/python-archetype:${{ github.event.pull_request.head.sha }}" >> $GITHUB_OUTPUT
5757

58-
- name: Build and push api
58+
- name: Build and push
5959
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
6060
with:
61-
file: api/src/api/Dockerfile
62-
tags: ${{ steps.api-docker-tag.outputs.api-docker-tag }}
61+
file: src/python_archetype/api/Dockerfile
62+
tags: ${{ steps.python-archetype-docker-tag.outputs.python-archetype-docker-tag }}
6363
push: false
6464

65-
deploy-api-dev:
65+
deploy-dev:
6666
needs: continuous-integration
67-
uses: ./.github/workflows/_deploy_api.yaml
67+
uses: ./.github/workflows/_deploy.yaml
6868
with:
6969
environment: dev
70-
docker_tag: ${{ needs.continuous-integration.outputs.api-docker-tag }}
70+
docker_tag: ${{ needs.continuous-integration.outputs.python-archetype-docker-tag }}
7171
secrets: inherit
7272

73-
deploy-transcriber-dev:
74-
needs: continuous-integration
75-
uses: ./.github/workflows/_deploy_transcriber.yaml
76-
with:
77-
environment: dev
78-
secrets: inherit
79-
80-
deploy-api-stg:
81-
needs: [deploy-api-dev, deploy-transcriber-dev]
82-
uses: ./.github/workflows/_deploy_api.yaml
73+
deploy-stg:
74+
needs: [deploy-dev]
75+
uses: ./.github/workflows/_deploy.yaml
8376
with:
8477
environment: stg
85-
docker_tag: ${{ needs.continuous-integration.outputs.api-docker-tag }}
86-
secrets: inherit
87-
88-
deploy-transcriber-stg:
89-
needs: [deploy-api-dev, deploy-transcriber-dev]
90-
uses: ./.github/workflows/_deploy_transcriber.yaml
91-
with:
92-
environment: stg
93-
secrets: inherit
94-
95-
deploy-api-pro:
96-
needs: [deploy-api-stg, deploy-transcriber-stg]
97-
uses: ./.github/workflows/_deploy_api.yaml
98-
with:
99-
environment: pro
100-
docker_tag: ${{ needs.continuous-integration.outputs.api-docker-tag }}
78+
docker_tag: ${{ needs.continuous-integration.outputs.python-archetype-docker-tag }}
10179
secrets: inherit
10280

103-
deploy-transcriber-pro:
104-
needs: [deploy-api-stg, deploy-transcriber-stg]
105-
uses: ./.github/workflows/_deploy_transcriber.yaml
81+
deploy-pro:
82+
needs: [deploy-stg]
83+
uses: ./.github/workflows/_deploy.yaml
10684
with:
10785
environment: pro
86+
docker_tag: ${{ needs.continuous-integration.outputs.python-archetype-docker-tag }}
10887
secrets: inherit

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"module": "fastapi",
99
"args": [
1010
"dev",
11-
"api/src/api/main.py"
11+
"src/python_archetype/api/main.py"
1212
],
1313
"console": "integratedTerminal",
1414
"justMyCode": false,

README.md

Lines changed: 0 additions & 3 deletions

api/pyproject.toml

Lines changed: 0 additions & 7 deletions
This file was deleted.

api/src/api/py.typed

Whitespace-only changes.

common/pyproject.toml

Lines changed: 0 additions & 7 deletions
This file was deleted.

common/src/common/py.typed

Whitespace-only changes.

domain/pyproject.toml

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)