Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
astroanu committed Apr 4, 2024
2 parents 7e850c6 + 2ff321a commit d36abcf
Show file tree
Hide file tree
Showing 7 changed files with 9,553 additions and 6,947 deletions.
2 changes: 1 addition & 1 deletion .github/actions/deploy/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ runs:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: 'us-east-1'
SOURCE_DIR: 'vue/dist'
SOURCE_DIR: 'vue/dist'
2 changes: 1 addition & 1 deletion .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jobs:
runs-on: ubuntu-latest
steps:

- uses: ./.github/actions/deploy
- uses: ./.github/actions/deploy
4 changes: 2 additions & 2 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy
name: Deploy - Prod

on:
push:
Expand All @@ -16,4 +16,4 @@ jobs:
runs-on: ubuntu-latest
steps:

- uses: ./.github/actions/deploy
- uses: ./.github/actions/deploy
3 changes: 2 additions & 1 deletion vue/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
dist
.DS_STORE
.DS_STORE
.yarn
1 change: 1 addition & 0 deletions vue/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
2 changes: 1 addition & 1 deletion vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "index.js",
"scripts": {
"watch": "node_modules/.bin/webpack-dev-server",
"build": "webpack",
"build": "NODE_OPTIONS=--openssl-legacy-provider webpack",
"prettier": "npx prettier --write ./js/**/*"
},
"author": "",
Expand Down
16,486 changes: 9,545 additions & 6,941 deletions vue/yarn.lock

Large diffs are not rendered by default.

0 comments on commit d36abcf

Please sign in to comment.