Skip to content

Commit

Permalink
Merge pull request #196 from boostcampwm-2021/dev
Browse files Browse the repository at this point in the history
 Release 0.3.0
  • Loading branch information
jiho-bae authored Nov 18, 2021
2 parents 805a318 + 0eac8ae commit a59a59f
Show file tree
Hide file tree
Showing 162 changed files with 19,467 additions and 663 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: back-end CI
name: back-end [API-Server] CI

on:
push:
Expand All @@ -17,7 +17,7 @@ jobs:
node-version: [16.13]
defaults:
run:
working-directory: ./server
working-directory: ./server/api

steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/FE-CI&CD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ jobs:
env:
REACT_APP_SERVER_URL: ${{ secrets.REACT_APP_SERVER_URL }}

- name: Github Repository Secrets로 환경변수를 전달합니다.
run: |
echo "REACT_APP_SOCKET_SERVER_URL=$REACT_APP_SOCKET_SERVER_URL" >> .env.production
env:
REACT_APP_SOCKET_SERVER_URL: ${{ secrets.REACT_APP_SOCKET_SERVER_URL }}

- name: 리액트 파일을 빌드합니다.
run: npm run build

Expand Down
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# compiled output
/dist
/node_modules
**/dist
**/node_modules

# Logs
logs
Expand Down Expand Up @@ -34,4 +34,6 @@ lerna-debug.log*
!.vscode/launch.json
!.vscode/extensions.json

*/.env
server/api/.env
server/socket/.env
**/.env
2 changes: 1 addition & 1 deletion client/craco.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
plugin: CracoAlias,
options: {
source: 'tsconfig',
baseUrl: './src',
baseUrl: '.',
tsConfigPath: 'tsconfig.paths.json',
},
},
Expand Down
Loading

0 comments on commit a59a59f

Please sign in to comment.