Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
cf6dc0c
chore: fix building snap packages
karolsojko Dec 5, 2023
f44d4e1
add electron native modules rebuild before snap build
karolsojko Dec 5, 2023
ff81bd0
update snap core env
karolsojko Dec 5, 2023
1e4d37b
remove rebuilds
karolsojko Dec 5, 2023
90ba71c
update electron builder
karolsojko Dec 5, 2023
359395e
remove base argument from snap
karolsojko Dec 5, 2023
d2b6d67
add review tools
karolsojko Dec 5, 2023
98989f3
Revert "remove rebuilds"
karolsojko Dec 5, 2023
20a8d72
fix snap review command
karolsojko Dec 5, 2023
c44e03b
review tools on test
karolsojko Dec 5, 2023
44089eb
change base for snap
karolsojko Dec 6, 2023
8d20f9b
add stage pacakges
karolsojko Dec 6, 2023
b73d736
reduce test build to snap only
karolsojko Dec 6, 2023
328cd20
fix plugs
karolsojko Dec 6, 2023
adc897c
change base to core20
karolsojko Dec 6, 2023
ec204c1
instal lxd
karolsojko Dec 6, 2023
b485425
install snapcraft with lxd
karolsojko Dec 6, 2023
6137f4b
fix lxd install
karolsojko Dec 6, 2023
ea72505
fix lxd init
karolsojko Dec 6, 2023
e47ea67
fix lxd configuration
karolsojko Dec 6, 2023
d6898b0
fix username
karolsojko Dec 6, 2023
39b9ec5
fix permissions
karolsojko Dec 6, 2023
8800288
setup lxd from cannonical
karolsojko Dec 6, 2023
600d91a
fix snap packaging
karolsojko Dec 6, 2023
5da8cba
fix canonical ref
karolsojko Dec 6, 2023
449f839
fix stage-packages
karolsojko Dec 6, 2023
a92c1d9
add build packages to snap
karolsojko Dec 6, 2023
7f227e5
tmp disable native modules
karolsojko Dec 6, 2023
88d5990
fix final step
karolsojko Dec 6, 2023
dbf17d9
fix evernote specs
karolsojko Dec 7, 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
17 changes: 13 additions & 4 deletions .github/workflows/desktop.release.reuse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@ jobs:

- run: yarn install --immutable

- name: Rebuild Electron Native Modules
run: yarn workspace @standardnotes/desktop rebuild:home-server

- run: yarn build:desktop

- run: echo APP_VERSION=$(node -p "require('./../web/package.json').version") >> $GITHUB_ENV
Expand Down Expand Up @@ -118,12 +115,24 @@ jobs:
env:
npm_config_target_arch: 'arm64'

- name: Snap
- name: Install Snapcraft
run: |
sudo snap install snapcraft --classic

- name: Setup LXD
uses: canonical/setup-lxd@v0.1.1

- name: Install Review Tools
run: sudo snap install review-tools

- name: Package Snap
run: |
yarn run webpack --config desktop.webpack.prod.js --env snap
yarn run electron-builder --linux --x64 -c.linux.target=snap --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }}

- name: Review Snap
run: review-tools.snap-review dist/standard-notes-${{ env.APP_VERSION }}-linux-amd64.snap

- name: Upload
uses: actions/upload-artifact@v3.0.0
with:
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/asar-npm-3.2.0-ce87ce2b73-f7d30b4597.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
15 changes: 13 additions & 2 deletions packages/desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"ava": "^5.1.0",
"babel-loader": "^9.1.0",
"copy-webpack-plugin": "^11.0.0",
"electron-builder": "23.6.0",
"electron-builder": "^24.9.1",
"electron-rebuild": "^3.2.9",
"eslint": "*",
"eslint-config-prettier": "^8.9.0",
Expand Down Expand Up @@ -142,9 +142,20 @@
]
},
"snap": {
"base": "core22",
"buildPackages": [
"python3",
"libpython3.10"
],
"stagePackages": [
"default",
"python3",
"libpython3.10"
],
"plugs": [
"default",
"password-manager-service"
"password-manager-service",
"network-bind"
]
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ describe('EvernoteConverter', () => {
expect(result?.length).toBe(3)
expect(result?.[0].content_type).toBe(ContentType.TYPES.Note)
expect((result?.[0] as DecryptedTransferPayload<NoteContent>).content.text).toBe(
'<div>This is a test.</div><font><span>h </span><span>e </span></font>',
'<p>This is a test.</p><ul></ul><ol></ol><font><span>h </span><span>e </span></font>',
)
expect(result?.[1].content_type).toBe(ContentType.TYPES.Note)
expect((result?.[1] as DecryptedTransferPayload<NoteContent>).content.text).toBe(
'<div>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</div>',
'<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</p>',
)
expect(result?.[2].content_type).toBe(ContentType.TYPES.Tag)
expect((result?.[2] as DecryptedTransferPayload<TagContent>).content.title).toBe('distant reading')
Expand Down
Loading