Skip to content

Commit 6992406

Browse files
committed
Merge branch 'develop' into discord-bot
2 parents 1b52ee0 + de8b135 commit 6992406

File tree

3,514 files changed

+4468
-370886
lines changed

Some content is hidden

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

3,514 files changed

+4468
-370886
lines changed

.github/workflows/web-app_web-app-prod.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build and deploy Node.js app to Azure Web App - web-app-prod
1+
name: Build and deploy SvelteKit app to Azure Web App - web-app-prod
22

33
on:
44
push:
@@ -20,14 +20,18 @@ jobs:
2020

2121
- name: npm install, build, and test
2222
run: |
23-
cd commanddash_web_app
23+
cd web
2424
npm install
2525
npm run build --if-present
2626
npm run test --if-present
27+
env:
28+
VITE_INSTRUMENTATION_KEY: ${{ secrets.VITE_INSTRUMENTATION_KEY }}
29+
2730
- name: Zip artifact for deployment
2831
run: |
29-
cd commanddash_web_app/build
30-
zip -r ../release.zip build node_modules package.json package-lock.json
32+
cd web
33+
zip -r ../release.zip build node_modules package.json package-lock.json -x "*.git*"
34+
3135
- name: Upload artifact for deployment job
3236
uses: actions/upload-artifact@v3
3337
with:
@@ -52,6 +56,11 @@ jobs:
5256
- name: Unzip artifact for deployment
5357
run: unzip release.zip -d deploy
5458

59+
- name: Install Node.js dependencies on Azure
60+
run: |
61+
cd deploy
62+
npm install --production
63+
5564
- name: Login to Azure
5665
uses: azure/login@v1
5766
with:

discord/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.env
2+
./node_modules/
3+
package-lock.json

discord/node_modules/.bin/mime

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)