Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: add cross-env so env. variables can be used in different OSs #488

Merged
merged 6 commits into from
Aug 11, 2023
Merged

fix: add cross-env so env. variables can be used in different OSs #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
919b369
fix: add cross-env so env. variables can be used in different OSs
javierguzman Aug 11, 2023
7363714
fix: add signing to commitizen
javierguzman Aug 11, 2023
0d0d975
fix: change commitizen flag
javierguzman Aug 11, 2023
a9d17b4
fix: removing universal from workflows again?
javierguzman Aug 11, 2023
bdd460d
fix: change commitizen sign command
javierguzman Aug 11, 2023
d2ba5e3
fix: use correct sign command for comittizen
javierguzman Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ jobs:
with:
name: artifacts
path: |
out/make/**/*universal.dmg
out/make/**/*.dmg
out/make/**/*.AppImage
windows_signing/**/*.exe

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ jobs:
with:
name: artifacts
path: |
out/make/**/*universal.dmg
out/make/**/*.dmg
out/make/**/*.AppImage
windows_signing/**/*.exe

Expand Down
2 changes: 1 addition & 1 deletion .husky/prepare-commit-msg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

test -t 1 && exec < /dev/tty && npx cz --hook || true
test -t 1 && exec < /dev/tty && npx cz -s --hook || true
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"main": ".webpack/main",
"scripts": {
"clean": "rm -rf dist && rm -rf out && rm -rf node_modules",
"start": "NODE_ENV=development electron-forge start",
"make-dev": "NODE_ENV=development electron-forge make --platform=darwin",
"start": "cross-env NODE_ENV=development electron-forge start",
"make-dev": "cross-env NODE_ENV=development electron-forge make --platform=darwin",
"package": "electron-forge package",
"make": "electron-forge make",
"make-win": "electron-forge make --platform=win32",
Expand All @@ -22,7 +22,7 @@
"prettier": "prettier --write \"./**/*.{js,json,css,scss,md}\"",
"test": "vitest run src/renderer/tests src/main/tests",
"e2e": "yarn playwright test",
"commit": "cz",
"commit": "cz -s",
"prepare": "husky install"
},
"keywords": [
Expand Down Expand Up @@ -73,6 +73,7 @@
"@vercel/webpack-asset-relocator-loader": "1.7.3",
"babel-loader": "^9.1.2",
"copy-webpack-plugin": "^11.0.0",
"cross-env": "^7.0.3",
"css-loader": "^6.0.0",
"cz-conventional-changelog": "^3.3.0",
"electron": "^25.2.0",
Expand Down
7 changes: 7 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4465,6 +4465,13 @@ create-require@^1.1.0:
resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==

cross-env@^7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
dependencies:
cross-spawn "^7.0.1"

cross-spawn-windows-exe@^1.1.0, cross-spawn-windows-exe@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/cross-spawn-windows-exe/-/cross-spawn-windows-exe-1.2.0.tgz#46253b0f497676e766faf4a7061004618b5ac5ec"
Expand Down