From 079bcc06b3bbf45a833ed1e64388792c3757c1fe Mon Sep 17 00:00:00 2001 From: Lucas Jensen Date: Thu, 2 May 2024 15:31:11 -0700 Subject: [PATCH 1/4] updated CI build --- .../workflows/build.yml => .github/workflows/server-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename server/.github/workflows/build.yml => .github/workflows/server-build.yml (94%) diff --git a/server/.github/workflows/build.yml b/.github/workflows/server-build.yml similarity index 94% rename from server/.github/workflows/build.yml rename to .github/workflows/server-build.yml index 9feb959..2b86c44 100644 --- a/server/.github/workflows/build.yml +++ b/.github/workflows/server-build.yml @@ -1,4 +1,4 @@ -name: thegrapefruitsduo backend build +name: thegrapefruitsduo fastapi build on: push: From 16295019951ef9ccddd19fe77dd8544052b6dab5 Mon Sep 17 00:00:00 2001 From: Lucas Jensen Date: Thu, 2 May 2024 15:33:24 -0700 Subject: [PATCH 2/4] update yml file --- .github/workflows/server-build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/server-build.yml b/.github/workflows/server-build.yml index 2b86c44..61aa6fe 100644 --- a/.github/workflows/server-build.yml +++ b/.github/workflows/server-build.yml @@ -15,6 +15,10 @@ jobs: steps: - uses: actions/checkout@v4 + + - name: change to server directory + run: cd server + - name: Set up Python 3.12 uses: actions/setup-python@v3 with: From 83d0aaa7306a6e2824158ba5b629105d58d53dfb Mon Sep 17 00:00:00 2001 From: Lucas Jensen Date: Thu, 2 May 2024 15:36:29 -0700 Subject: [PATCH 3/4] update yml file --- .github/workflows/server-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/server-build.yml b/.github/workflows/server-build.yml index 61aa6fe..b7d66bb 100644 --- a/.github/workflows/server-build.yml +++ b/.github/workflows/server-build.yml @@ -16,9 +16,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: change to server directory - run: cd server - - name: Set up Python 3.12 uses: actions/setup-python@v3 with: @@ -28,13 +25,16 @@ jobs: uses: abatilo/actions-poetry@v2 - name: Install dependencies + working-directory: server run: | poetry install - name: Lint with black + working-directory: server run: | poetry run black --check . - name: Test with pytest + working-directory: server run: | poetry run pytest -s From 76bd46263826b0cda9226b765b764f27a3a9f885 Mon Sep 17 00:00:00 2001 From: Lucas Jensen Date: Thu, 2 May 2024 16:00:09 -0700 Subject: [PATCH 4/4] added client build yml --- .../workflows/build.yml => .github/workflows/client-build.yml | 2 ++ 1 file changed, 2 insertions(+) rename client/.github/workflows/build.yml => .github/workflows/client-build.yml (89%) diff --git a/client/.github/workflows/build.yml b/.github/workflows/client-build.yml similarity index 89% rename from client/.github/workflows/build.yml rename to .github/workflows/client-build.yml index 347c28e..e17a775 100644 --- a/client/.github/workflows/build.yml +++ b/.github/workflows/client-build.yml @@ -23,11 +23,13 @@ jobs: node-version: ${{ matrix.node-version }} - name: Lint + working-directory: client run: | npm install npm run prettier:check - name: Build + working-directory: client run: | npm install npm run build