Skip to content

Commit 6cf1030

Browse files
ricardovanlaarhovenricardovanlaarhoven
authored
Merge branch 'master' into form-components-not-required
2 parents 9aa06be + 8b7442f commit 6cf1030

File tree

2 files changed

+67
-57
lines changed

2 files changed

+67
-57
lines changed

‎generator/templates/Deployment/_github/workflows/deploy.production.yml‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ jobs:
2828
chmod 600 ~/.ssh/id_rsa
2929
eval `ssh-agent -s`
3030
ssh-add ~/.ssh/id_rsa
31+
3132
- name: test connection
3233
run: ssh -T jumphost@jumphost.kingscode.nl
34+
3335
<%_ if (options.plugins.includes('fontawesomepro')){ _%>
3436
- name: build .npmrc
3537
env:
@@ -38,26 +40,25 @@ jobs:
3840
echo "@fortawesome:registry=https://npm.fontawesome.com/" >> .npmrc
3941
echo "//npm.fontawesome.com/:_authToken=$FONT_AWESOME_TOKEN" >> .npmrc
4042
<%_ } _%>
43+
4144
- name: build application environment
42-
env:
43-
CLIENT_ID: ${{ secrets.client_id }}
44-
CLIENT_SECRET: ${{ secrets.client_secret }}
4545
run: |
4646
touch .env.production
4747
echo "NODE_ENV=production" >> .env.production
4848
echo "VUE_APP_ROOT_API=" >> .env.production
49-
echo "VUE_APP_SENTRY=" >> .env.production
5049
<%_ if (options.plugins.includes('analytics')) { _%>
5150
echo "VUE_APP_ANALYTICS=" >> .env.production
5251
<%_ } _%>
5352
<%_ if (options.plugins.includes('sentry')) { _%>
54-
echo "VUE_APP_ANALYTICS=" >> .env.production
53+
echo "VUE_APP_SENTRY=" >> .env.production
5554
<%_ } _%>
5655
echo "VUE_APP_PUBLIC_PATH=/" >> .env.production
57-
- name: build the environment
56+
57+
- name: build
5858
run: |
5959
npm ci
6060
npm run build
61+
6162
- name: remove /old deployment and create /new folder for deployment
6263
uses: appleboy/ssh-action@master
6364
with:
@@ -68,25 +69,29 @@ jobs:
6869
proxy_username: jumphost
6970
proxy_key: ${{ secrets.private_key }}
7071
script: |
72+
shopt -s dotglob
7173
cd ~/domains/example.com/public_html
7274
rm -rf ./old
7375
mkdir -p ./new
7476
mkdir -p ./old
77+
7578
- name: deployment
7679
run: |
7780
cd dist
7881
rsync -ave "ssh -o ProxyJump=jumphost@jumphost.kingscode.nl" ./ user@host:~/domains/example.com/public_html/new
82+
7983
- name: move previous deployment to ./old and move ./new deployment to ./
80-
uses: appleboy/ssh-action@master
81-
with:
82-
host: host
83-
username: user
84-
key: ${{ secrets.private_key }}
85-
proxy_host: jumphost.kingscode.nl
86-
proxy_username: jumphost
87-
proxy_key: ${{ secrets.private_key }}
88-
script: |
89-
cd ~/domains/example.com/public_html
90-
mv `\ls -1 ./ | grep -v "\<new\>" | grep -v "\<old\>" | grep -v "\<api\>"` ./old
91-
mv ./new/* ./
92-
rm -rf ./new
84+
uses: appleboy/ssh-action@master
85+
with:
86+
host: host
87+
username: user
88+
key: ${{ secrets.private_key }}
89+
proxy_host: jumphost.kingscode.nl
90+
proxy_username: jumphost
91+
proxy_key: ${{ secrets.private_key }}
92+
script: |
93+
shopt -s dotglob
94+
cd ~/domains/example.com/public_html
95+
mv `\ls -1 ./ | grep -v "\<new\>" | grep -v "\<old\>" | grep -v "\<api\>"` ./old
96+
mv ./new/* ./
97+
rm -rf ./new

‎generator/templates/Deployment/_github/workflows/deploy.test.yml‎

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -28,75 +28,80 @@ jobs:
2828
chmod 600 ~/.ssh/id_rsa
2929
eval `ssh-agent -s`
3030
ssh-add ~/.ssh/id_rsa
31-
- name: test connection
31+
32+
- name: test jumphost connection
3233
run: ssh -T jumphost@jumphost.kingscode.nl
33-
<%_ if (options.plugins.includes('fontawesomepro')){ _%>
34+
35+
<%_ if (options.plugins.includes('fontawesomepro')){ _%>
3436
- name: build .npmrc
3537
env:
3638
FONT_AWESOME_TOKEN: ${{ secrets.font_awesome_token }}
3739
run: |
3840
echo "@fortawesome:registry=https://npm.fontawesome.com/" >> .npmrc
3941
echo "//npm.fontawesome.com/:_authToken=$FONT_AWESOME_TOKEN" >> .npmrc
40-
<%_ } _%>
42+
<%_ } _%>
43+
4144
- name: build application environment
42-
env:
43-
CLIENT_ID: ${{ secrets.client_id }}
44-
CLIENT_SECRET: ${{ secrets.client_secret }}
4545
run: |
4646
touch .env.production
4747
echo "NODE_ENV=production" >> .env.production
4848
echo "VUE_APP_ROOT_API=" >> .env.production
49-
echo "VUE_APP_SENTRY=" >> .env.production
50-
echo "VUE_APP_ANALYTICS=" >> .env.production
5149
<%_ if (options.plugins.includes('analytics')) { _%>
5250
echo "VUE_APP_ANALYTICS=" >> .env.production
5351
<%_ } _%>
5452
<%_ if (options.plugins.includes('sentry')) { _%>
55-
echo "VUE_APP_ANALYTICS=" >> .env.production
53+
echo "VUE_APP_SENTRY=" >> .env.production
5654
<%_ } _%>
5755
echo "VUE_APP_PUBLIC_PATH=/" >> .env.production
58-
<%_ if (!options.addRobotsFile){ _%>
56+
57+
<%_ if (!options.addRobotsFile){ _%>
5958
- name: setup robots.txt for disallowing search engines to visit the test env
6059
run: |
6160
cd public
6261
touch robots.txt
6362
echo "" > robots.txt
6463
echo "User-agent: *" >> robots.txt
6564
echo "Disallow: /" >> robots.txt
66-
<%_ } _%>
67-
- name: build the environment
65+
<%_ } _%>
66+
67+
- name: build
6868
run: |
6969
npm ci
7070
npm run build
71+
7172
- name: remove /old deployment and create /new folder for deployment
72-
uses: appleboy/ssh-action@master
73-
with:
74-
host: host
75-
username: user
76-
key: ${{ secrets.private_key }}
77-
proxy_host: jumphost.kingscode.nl
78-
proxy_username: jumphost
79-
proxy_key: ${{ secrets.private_key }}
80-
script: |
81-
cd ~/domains/example.com/public_html
82-
rm -rf ./old
83-
mkdir -p ./new
84-
mkdir -p ./old
73+
uses: appleboy/ssh-action@master
74+
with:
75+
host: host
76+
username: user
77+
key: ${{ secrets.private_key }}
78+
proxy_host: jumphost.kingscode.nl
79+
proxy_username: jumphost
80+
proxy_key: ${{ secrets.private_key }}
81+
script: |
82+
shopt -s dotglob
83+
cd ~/domains/example.com/public_html
84+
rm -rf ./old
85+
mkdir -p ./new
86+
mkdir -p ./old
87+
8588
- name: deployment
8689
run: |
8790
cd dist
8891
rsync -ave "ssh -o ProxyJump=jumphost@jumphost.kingscode.nl" ./ user@host:~/domains/example.com/public_html/new
92+
8993
- name: move previous deployment to ./old and move ./new deployment to ./
90-
uses: appleboy/ssh-action@master
91-
with:
92-
host: host
93-
username: user
94-
key: ${{ secrets.private_key }}
95-
proxy_host: jumphost.kingscode.nl
96-
proxy_username: jumphost
97-
proxy_key: ${{ secrets.private_key }}
98-
script: |
99-
cd ~/domains/example.com/public_html
100-
mv `\ls -1 ./ | grep -v "\<new\>" | grep -v "\<old\>" | grep -v "\<api\>"` ./old
101-
mv ./new/* ./
102-
rm -rf ./new
94+
uses: appleboy/ssh-action@master
95+
with:
96+
host: host
97+
username: user
98+
key: ${{ secrets.private_key }}
99+
proxy_host: jumphost.kingscode.nl
100+
proxy_username: jumphost
101+
proxy_key: ${{ secrets.private_key }}
102+
script: |
103+
shopt -s dotglob
104+
cd ~/domains/example.com/public_html
105+
mv `\ls -1 ./ | grep -v "\<new\>" | grep -v "\<old\>" | grep -v "\<api\>"` ./old
106+
mv ./new/* ./
107+
rm -rf ./new

0 commit comments

Comments
 (0)