rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore: merge conflicts

Browse Source
This commit is contained in:
Mo
2022-06-17 11:47:59 -05:00
parent 5964f91b2e 8b7b70eae7
commit a09fe44c44
6 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
.github/workflows/desktop.release.reuse.yml vendored
View File

@@ -25,14 +25,17 @@ jobs:
registry-url: 'https://registry.npmjs.org'
- run: yarn install
- run: yarn build:desktop
- run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV
- name: Compile Mac
run: yarn run webpack --config desktop.webpack.prod.js
- name: MacX64
run: |
yarn run electron-builder --mac --x64 --publish=never
yarn run electron-builder --mac --x64 --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
node scripts/fixMacZip.js
- name: MacArm64
run: yarn run electron-builder --mac --arm64 --publish=never
run: yarn run electron-builder --mac --arm64 --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
- name: Upload
uses: actions/upload-artifact@v3.0.0
with:
@@ -58,37 +61,41 @@ jobs:
uses: ruby/setup-ruby@v1
- name: Install FPM
run: sudo gem install fpm -f
- run: yarn install
- run: yarn build:desktop
- run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV
- name: Compile for AppImage
run: yarn run webpack --config desktop.webpack.prod.js
- name: AppImage
run: yarn run electron-builder --linux --x64 --ia32 -c.linux.target=AppImage --publish=never
run: yarn run electron-builder --linux --x64 --ia32 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
- name: AppImageX64
run: yarn run electron-builder --linux --x64 -c.linux.target=AppImage --publish=never
run: yarn run electron-builder --linux --x64 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
- name: AppImageArm64
run: yarn run electron-builder --linux --arm64 -c.linux.target=AppImage --publish=never
run: yarn run electron-builder --linux --arm64 -c.linux.target=AppImage --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
- name: Deb
run: |
yarn run webpack --config desktop.webpack.prod.js --env deb
yarn run electron-builder --linux --x64 --ia32 -c.linux.target=deb --publish=never
yarn run electron-builder --linux --x64 --ia32 -c.linux.target=deb --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
- name: DebArm64
env:
npm_config_target_arch: 'arm64'
USE_SYSTEM_FPM: 'true'
run: |
yarn run webpack --config desktop.webpack.prod.js --env deb
yarn run electron-builder --linux --arm64 -c.linux.target=deb --publish=never
yarn run electron-builder --linux --arm64 -c.linux.target=deb --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
- name: Dir
run: |
yarn run webpack --config desktop.webpack.prod.js
yarn run electron-builder --linux --x64 -c.linux.target=dir --publish=never
yarn run electron-builder --linux --x64 -c.linux.target=dir --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
- name: DirArm64
run: |
yarn run webpack --config desktop.webpack.prod.js
yarn run electron-builder --linux --arm64 -c.linux.target=dir --publish=never
yarn run electron-builder --linux --arm64 -c.linux.target=dir --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
env:
npm_config_target_arch: 'arm64'
@@ -96,7 +103,7 @@ jobs:
run: |
sudo snap install snapcraft --classic
yarn run webpack --config desktop.webpack.prod.js --env snap
yarn run electron-builder --linux --x64 -c.linux.target=snap --publish=never
yarn run electron-builder --linux --x64 -c.linux.target=snap --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
- name: Upload
uses: actions/upload-artifact@v3.0.0
@@ -126,7 +133,8 @@ jobs:
- run: yarn install
- run: yarn build:desktop
- run: yarn run webpack --config desktop.webpack.prod.js
- run: yarn run electron-builder --windows --x64 --ia32 --publish=never
- run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV
- run: yarn run electron-builder --windows --x64 --ia32 --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
- name: Upload
uses: actions/upload-artifact@v3.0.0

3
.github/workflows/desktop.windows.sign.yml vendored
View File

@@ -21,7 +21,8 @@ jobs:
- run: yarn install
- run: yarn build:desktop
- run: yarn run webpack --config desktop.webpack.prod.js
- run: yarn run electron-builder --windows --x64 --ia32 --publish=never
- run: echo APP_VERSION=$(node -p "require('./package.json').version") >> $GITHUB_ENV
- run: yarn run electron-builder --windows --x64 --ia32 --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}
- name: Upload
uses: actions/upload-artifact@v3.0.0

1
package.json
View File

@@ -6,7 +6,6 @@
"workspaces": {
"packages": [
"packages/*",
"packages/desktop/app",
"packages/components/src/packages/*"
]
},

15
packages/desktop/CHANGELOG.md
View File

@@ -10,6 +10,21 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
## [3.22.7](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.22.7-alpha.1...@standardnotes/desktop@3.22.7) (2022-06-17)
**Note:** Version bump only for package @standardnotes/desktop
## [3.22.7-alpha.4](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.22.7-alpha.3...@standardnotes/desktop@3.22.7-alpha.4) (2022-06-17)
**Note:** Version bump only for package @standardnotes/desktop
## [3.22.7-alpha.3](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.22.7-alpha.2...@standardnotes/desktop@3.22.7-alpha.3) (2022-06-17)
### Bug Fixes
* **desktop:** provide template version ([66241cb](https://github.com/standardnotes/app/commit/66241cb038753583d61d43bfef44ecdf158ac337))
## [3.22.7-alpha.2](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.22.7-alpha.1...@standardnotes/desktop@3.22.7-alpha.2) (2022-06-17)
### Bug Fixes
* **desktop:** use top level package json for versioning ([93e9701](https://github.com/standardnotes/app/commit/93e97013c113f054b59f5cc27c3ee579448c32cb))
## [3.22.7-alpha.1](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.22.7-alpha.0...@standardnotes/desktop@3.22.7-alpha.1) (2022-06-17)

1
packages/desktop/app/package.json
View File

@@ -4,7 +4,6 @@
"private": true,
"description": "An end-to-end encrypted notes app for digitalists and professionals.",
"author": "Standard Notes <help@standardnotes.com>",
"version": "3.22.5",
"main": "./dist/index.js",
"installConfig": {
"selfReferences": true

2
packages/desktop/scripts/fixMacZip.js
View File

@@ -31,7 +31,7 @@ async function getBlockMapInfo(fileName) {
;(async () => {
try {
const { version } = JSON.parse(await fs.promises.readFile('app/package.json'))
const { version } = JSON.parse(await fs.promises.readFile('package.json'))
const zipName = `standard-notes-${version}-mac-x64.zip`
const zipPath = `dist/${zipName}`
console.log(`Removing ${zipPath}`)