Skip to content

Commit

Permalink
Merge pull request #56 from beabee-communityrm/fix/github-action-main
Browse files Browse the repository at this point in the history
chore(github): Fix action: Location of .env has changed
  • Loading branch information
JumpLink authored Oct 11, 2024
2 parents 79954d6 + bf30697 commit 576058a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/backend-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/backend-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 4 additions & 2 deletions apps/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -107,4 +109,4 @@
"overrides": {
"formiojs": "npm:@beabee/formiojs@^4.15.11"
}
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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/*",
Expand Down

0 comments on commit 576058a

Please sign in to comment.