Skip to content

Commit 91bbdfd

Browse files
jinhodotchoijinhodotchoi
authored
Merge pull request #148 from PoolC/dev
release
2 parents eac770f + cc6ec16 commit 91bbdfd

File tree

1,283 files changed

+8932
-21483
lines changed

Some content is hidden

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

1,283 files changed

+8932
-21483
lines changed

‎.github/workflows/web-client-deploy-development.yml‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,28 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v4
1313

14-
- uses: actions/setup-node@v4
15-
with:
16-
node-version: '20'
17-
cache: 'yarn'
14+
# TODO: 패키지 구조 변경 및 s3 배포에 따라 변경해야함
15+
# - uses: actions/setup-node@v4
16+
# with:
17+
# node-version: '20'
18+
# cache: 'yarn'
1819

19-
- name: build
20-
run: |
21-
rm ./apps/web-client/.env && mv ./apps/web-client/.env.dev ./apps/web-client/.env
22-
yarn set version 3.8.1
23-
yarn install --immutable --immutable-cache
24-
yarn web-client codegen
25-
yarn web-client build
20+
# - name: build
21+
# run: |
22+
# rm ./apps/web/.env && mv ./apps/web/.env.dev ./apps/web/.env
23+
# yarn set version 3.8.1
24+
# yarn install --immutable --immutable-cache
25+
# yarn web codegen
26+
# yarn web build
2627

27-
- name: scp
28-
uses: appleboy/scp-action@v0.1.7
29-
with:
30-
host: ${{ secrets.SSH_HOST }}
31-
username: ${{ secrets.SSH_USERNAME }}
32-
key: ${{ secrets.SSH_PEM_KEY }}
33-
port: ${{ secrets.SSH_PORT }}
34-
source: ./apps/web-client/build/*
35-
target: ~/k8s/dialga/build
36-
strip_components: 3
28+
# - name: scp
29+
# uses: appleboy/scp-action@v0.1.7
30+
# with:
31+
# host: ${{ secrets.SSH_HOST }}
32+
# username: ${{ secrets.SSH_USERNAME }}
33+
# key: ${{ secrets.SSH_PEM_KEY }}
34+
# port: ${{ secrets.SSH_PORT }}
35+
# source: ./apps/web/build/*
36+
# # TODO: 패키지 구조 변경에 따라 target 디렉토리도 변경해야함
37+
# target: ~/dialga/apps/web-client/build
38+
# strip_components: 3

‎.github/workflows/web-client-deploy-production.yml‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,28 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v4
1313

14-
- uses: actions/setup-node@v4
15-
with:
16-
node-version: '20'
17-
cache: 'yarn'
14+
# TODO: 패키지 구조 변경 및 s3 배포에 따라 변경해야함
15+
# - uses: actions/setup-node@v4
16+
# with:
17+
# node-version: '20'
18+
# cache: 'yarn'
1819

19-
- name: build
20-
run: |
21-
rm ./apps/web-client/.env && mv ./apps/web-client/.env.prod ./apps/web-client/.env
22-
yarn set version 3.8.1
23-
yarn install --immutable --immutable-cache
24-
yarn web-client codegen
25-
yarn web-client build
20+
# - name: build
21+
# run: |
22+
# rm ./apps/web/.env && mv ./apps/web/.env.prod ./apps/web/.env
23+
# yarn set version 3.8.1
24+
# yarn install --immutable --immutable-cache
25+
# yarn web codegen
26+
# yarn web build
2627

27-
- name: scp
28-
uses: appleboy/scp-action@v0.1.7
29-
with:
30-
host: ${{ secrets.SSH_HOST }}
31-
username: ${{ secrets.SSH_USERNAME }}
32-
key: ${{ secrets.SSH_PEM_KEY }}
33-
port: ${{ secrets.SSH_PORT }}
34-
source: ./apps/web-client/build/*
35-
target: ~/dialga/apps/web-client/build
36-
strip_components: 3
28+
# - name: scp
29+
# uses: appleboy/scp-action@v0.1.7
30+
# with:
31+
# host: ${{ secrets.SSH_HOST }}
32+
# username: ${{ secrets.SSH_USERNAME }}
33+
# key: ${{ secrets.SSH_PEM_KEY }}
34+
# port: ${{ secrets.SSH_PORT }}
35+
# source: ./apps/web/build/*
36+
# # TODO: 패키지 구조 변경에 따라 target 디렉토리도 변경해야함
37+
# target: ~/dialga/apps/web-client/build
38+
# strip_components: 3

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ yarn-debug.log*
1818
yarn-error.log*
1919

2020
# dependencies @see https://yarnpkg.com/getting-started/qa/#which-files-should-be-gitignored
21+
.pnp.*
2122
.yarn/*
22-
!.yarn/cache
2323
!.yarn/patches
2424
!.yarn/plugins
2525
!.yarn/releases

‎.yarn/cache/@ampproject-remapping-npm-2.3.0-559c14eee4-d3ad7b89d9.zip‎

-27.3 KB
Binary file not shown.

‎.yarn/cache/@ant-design-colors-npm-7.1.0-58bcca5a08-6488b4159c.zip‎

-17.4 KB
Binary file not shown.

‎.yarn/cache/@ant-design-cssinjs-npm-1.21.0-dac24fa5c4-d1fe42e180.zip‎

-126 KB
Binary file not shown.

‎.yarn/cache/@ant-design-icons-npm-5.3.7-cb4cab5907-96a0f7e331.zip‎

-4.69 MB
Binary file not shown.

‎.yarn/cache/@ant-design-icons-svg-npm-4.4.2-a4055393f1-c66cda4533.zip‎

-2.62 MB
Binary file not shown.

‎.yarn/cache/@ant-design-react-slick-npm-1.1.2-4d15ec3292-e3f310ceb0.zip‎

-198 KB
Binary file not shown.

‎.yarn/cache/@apidevtools-json-schema-ref-parser-npm-11.6.4-9fc29728c0-ac01bb318d.zip‎

-112 KB
Binary file not shown.

0 commit comments

Comments
 (0)