From bf3069772d0e39e8a8ad8f982ea1650535f44858 Mon Sep 17 00:00:00 2001 From: Pascal Garber Date: Fri, 11 Oct 2024 12:46:25 +0200 Subject: [PATCH] chore(github): Fix action: The location of the .env for the backend has changed --- .github/workflows/backend-deploy.yml | 3 +-- .github/workflows/backend-release.yml | 3 +-- apps/frontend/package.json | 6 ++++-- package.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/backend-deploy.yml b/.github/workflows/backend-deploy.yml index 766f1acc2..bc54cfa3a 100644 --- a/.github/workflows/backend-deploy.yml +++ b/.github/workflows/backend-deploy.yml @@ -32,8 +32,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup - - run: cp .env.example .env - working-directory: ./apps/backend + - run: yarn presetup - run: yarn test working-directory: ./apps/backend diff --git a/.github/workflows/backend-release.yml b/.github/workflows/backend-release.yml index 26cdf43b4..49e4a9d1d 100644 --- a/.github/workflows/backend-release.yml +++ b/.github/workflows/backend-release.yml @@ -15,8 +15,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup - - run: cp .env.example .env - working-directory: ./apps/backend + - run: yarn presetup - run: yarn test working-directory: ./apps/backend diff --git a/apps/frontend/package.json b/apps/frontend/package.json index c3d2eb906..8f523e000 100644 --- a/apps/frontend/package.json +++ b/apps/frontend/package.json @@ -19,7 +19,9 @@ "generate:index": "barrelsby --config barrelsby.json", "docker:build:latest": "docker build --build-arg REVISION=$(git rev-parse --short HEAD) --build-arg VERSION=latest -t beabee/frontend:latest -f ./Dockerfile ../../", "docker:start": "docker run -d -p 3002:80 -e APP_BASE_URL=http://localhost:3001 -e API_BASE_URL=/api/1.0/ beabee/frontend", - "docker:restart": "docker restart $(docker ps -a | grep beabee/frontend | awk '{print $1}')" + "docker:restart": "docker restart $(docker ps -a | grep beabee/frontend | awk '{print $1}')", + "presetup": "yarn presetup:env", + "presetup:env": "cp -n .env.example .env 2>/dev/null || true" }, "dependencies": { "@appsignal/javascript": "^1.3.30", @@ -107,4 +109,4 @@ "overrides": { "formiojs": "npm:@beabee/formiojs@^4.15.11" } -} +} \ No newline at end of file diff --git a/package.json b/package.json index ca5dee9f7..80fb257a7 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,8 @@ "setup:user": "docker compose run --rm app node built/tools/new-user", "setup:payment": "docker compose exec app node built/tools/configure", "setup:db": "yarn workspace @beabee/backend run typeorm:migrate", - "presetup": "yarn presetup:env", - "presetup:env": "cp -n .env.example .env 2>/dev/null || true && cp -n apps/frontend/.env.example apps/frontend/.env 2>/dev/null || true" + "presetup": "yarn workspaces foreach -v -W -p -i run presetup && yarn presetup:env", + "presetup:env": "cp -n .env.example .env 2>/dev/null || true" }, "workspaces": [ "packages/*",