Skip to content

Commit

Permalink
Merge branch 'master' into feature/share-popover
Browse files Browse the repository at this point in the history
  • Loading branch information
MrCoder committed Nov 4, 2023
2 parents 3fd5e72 + 6417d08 commit 934de2b
Show file tree
Hide file tree
Showing 6 changed files with 311 additions and 285 deletions.
2 changes: 1 addition & 1 deletion .firebaserc
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
"staging": "staging-zenuml-27954",
"prod": "web-sequence-local"
}
}
}
32 changes: 0 additions & 32 deletions .github/workflows/deploy-staging.yml

This file was deleted.

22 changes: 22 additions & 0 deletions .github/workflows/firebase-hosting-merge-staging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# This file was auto-generated by the Firebase CLI
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on merge
'on':
push:
branches:
- master
jobs:
build_and_deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: yarn install && yarn build && yarn release
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_STAGING_ZENUML_27954 }}'
channelId: live
projectId: staging-zenuml-27954
env:
FIREBASE_CLI_PREVIEWS: hostingchannels
18 changes: 18 additions & 0 deletions .github/workflows/firebase-hosting-pull-request-staging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# This file was auto-generated by the Firebase CLI
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on PR
'on': pull_request
jobs:
build_and_preview:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: yarn install && yarn build && yarn release
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_STAGING_ZENUML_27954 }}'
projectId: staging-zenuml-27954
env:
FIREBASE_CLI_PREVIEWS: hostingchannels
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"babel-minify": "^0.5.2",
"enzyme": "^3.11.0",
"enzyme-adapter-preact-pure": "^2.3.0",
"eslint": "^6.0.1",
"eslint": "^8.52.0",
"eslint-config-preact": "^1.1.0",
"git-revision-webpack-plugin": "^5.0.0",
"gulp": "^3.9.1",
Expand All @@ -59,18 +59,18 @@
},
"dependencies": {
"@emmetio/codemirror-plugin": "^1.1.3",
"@zenuml/core": "^3.13.1",
"@zenuml/core": "^3.13.3",
"code-blast-codemirror": "chinchang/code-blast-codemirror#web-maker",
"codemirror": "^5.54.0",
"codemirror": "^5.65.15",
"dom-to-image": "github:MichalBryxi/dom-to-image",
"esprima": "^4.0.0",
"file-saver": "^2.0.2",
"firebase": "^7.16.1",
"firebase-tools": "^8.4.3",
"http-server": "^0.12.3",
"jszip": "^3.5.0",
"preact": "10.6.6",
"preact-render-to-string": "^5.1.4",
"preact": "10.18.1",
"preact-render-to-string": "^6.2.2",
"preact-router": "^4.1.2",
"split.js": "1.6.0",
"svg-transform-loader": "^2.0.12",
Expand Down Expand Up @@ -126,6 +126,7 @@
},
"homepage": "http://zenuml.com",
"volta": {
"node": "12.22.0"
"node": "16.16.0",
"yarn": "1.22.19"
}
}
}
Loading

0 comments on commit 934de2b

Please sign in to comment.