Skip to content

Commit 43681d7

Browse files
Merge pull request #15 from squeeble-ink/develop
Release v2.3.0
2 parents b28da7a + e55db82 commit 43681d7

File tree

20 files changed

+1141
-1144
lines changed

20 files changed

+1141
-1144
lines changed

.github/workflows/deploy-dev.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
name: Deploy Node.js CI - DO-001
1+
# name: Deploy Node.js CI - DO-001
22

3-
on:
4-
push:
5-
branches: [develop]
3+
# on:
4+
# push:
5+
# branches: [develop]
66

7-
jobs:
8-
build:
9-
runs-on: [ubuntu-22.04]
7+
# jobs:
8+
# build:
9+
# runs-on: [ubuntu-22.04]
1010

11-
steps:
12-
- name: Deploy development
13-
uses: appleboy/ssh-action@master
14-
with:
15-
host: ${{ secrets.MAIN_IP }}
16-
username: ${{ secrets.GHA_USER }}
17-
key: ${{ secrets.GHA_SSH }}
18-
passphrase: ${{ secrets.GHA_PW }}
19-
script: |
20-
eval `ssh-agent -s`
21-
cd ./_server/${{ vars.REPO_NAME }}/dev/
22-
rm -rf ./${{ vars.REPO_NAME }}
23-
ssh-add ~/.ssh/${{ secrets.REPO_SSH_NAME }}
24-
git clone git@github.com:squeeble-ink/${{ vars.REPO_NAME }}.git
25-
cd ./${{ vars.REPO_NAME }}
26-
git checkout develop
27-
rm ./nginx/prd.conf
28-
rm ./nginx/prd-location.conf
29-
docker compose up dev -d --build
11+
# steps:
12+
# - name: Deploy development
13+
# uses: appleboy/ssh-action@master
14+
# with:
15+
# host: ${{ secrets.MAIN_IP }}
16+
# username: ${{ secrets.GHA_USER }}
17+
# key: ${{ secrets.GHA_SSH }}
18+
# passphrase: ${{ secrets.GHA_PW }}
19+
# script: |
20+
# eval `ssh-agent -s`
21+
# cd ./_server/${{ vars.REPO_NAME }}/dev/
22+
# rm -rf ./${{ vars.REPO_NAME }}
23+
# ssh-add ~/.ssh/${{ secrets.REPO_SSH_NAME }}
24+
# git clone git@github.com:squeeble-ink/${{ vars.REPO_NAME }}.git
25+
# cd ./${{ vars.REPO_NAME }}
26+
# git checkout develop
27+
# rm ./nginx/prd.conf
28+
# rm ./nginx/prd-location.conf
29+
# docker compose up dev -d --build

.github/workflows/deploy-prd.yml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
name: Deploy Node.js CI - DO-001
1+
# name: Deploy Node.js CI - DO-001
22

3-
on:
4-
push:
5-
branches: [main]
3+
# on:
4+
# push:
5+
# branches: [main]
66

7-
jobs:
8-
build:
9-
runs-on: [ubuntu-22.04]
10-
env:
11-
NODE_ENV: production
7+
# jobs:
8+
# build:
9+
# runs-on: [ubuntu-22.04]
10+
# env:
11+
# NODE_ENV: production
1212

13-
steps:
14-
- name: Deploy production
15-
uses: appleboy/ssh-action@master
16-
with:
17-
host: ${{ secrets.MAIN_IP }}
18-
username: ${{ secrets.GHA_USER }}
19-
key: ${{ secrets.GHA_SSH }}
20-
passphrase: ${{ secrets.GHA_PW }}
21-
script: |
22-
eval `ssh-agent -s`
23-
cd ./_server/${{ vars.REPO_NAME }}/prd/
24-
rm -rf ./${{ vars.REPO_NAME }}
25-
ssh-add ~/.ssh/${{ secrets.REPO_SSH_NAME }}
26-
git clone git@github.com:squeeble-ink/${{ vars.REPO_NAME }}.git
27-
cd ./${{ vars.REPO_NAME }}
28-
rm ./nginx/dev.conf
29-
rm ./nginx/dev-location.conf
30-
docker compose up prd -d --build
13+
# steps:
14+
# - name: Deploy production
15+
# uses: appleboy/ssh-action@master
16+
# with:
17+
# host: ${{ secrets.MAIN_IP }}
18+
# username: ${{ secrets.GHA_USER }}
19+
# key: ${{ secrets.GHA_SSH }}
20+
# passphrase: ${{ secrets.GHA_PW }}
21+
# script: |
22+
# eval `ssh-agent -s`
23+
# cd ./_server/${{ vars.REPO_NAME }}/prd/
24+
# rm -rf ./${{ vars.REPO_NAME }}
25+
# ssh-add ~/.ssh/${{ secrets.REPO_SSH_NAME }}
26+
# git clone git@github.com:squeeble-ink/${{ vars.REPO_NAME }}.git
27+
# cd ./${{ vars.REPO_NAME }}
28+
# rm ./nginx/dev.conf
29+
# rm ./nginx/dev-location.conf
30+
# docker compose up prd -d --build

.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,15 @@ typings/
6565
# Output of 'npm pack'
6666
*.tgz
6767

68+
# Yarn Non Zero Installs config
69+
.pnp.*
70+
.yarn/*
71+
!.yarn/patches
72+
!.yarn/plugins
73+
!.yarn/releases
74+
!.yarn/sdks
75+
!.yarn/versions
76+
6877
# Yarn Integrity file
6978
.yarn-integrity
7079

0 commit comments

Comments
 (0)