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

Update desktop.git to 3.6.2 #6

Merged
merged 1 commit into from
Mar 17, 2021
Merged

Update desktop.git to 3.6.2 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions org.standardnotes.standardnotes.metainfo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<url type="donation">https://github.com/sponsors/standardnotes</url>
<url type="help">https://standardnotes.org/help</url>

<content_rating type="oars-1.1" />
<content_rating type="oars-1.1"/>

<screenshots>
<screenshot type="default">
Expand All @@ -114,6 +114,7 @@
</screenshots>

<releases>
<release version="v3.6.1" date="2021-03-03" />
<release version="3.6.2" date="2021-03-17"/>
<release version="v3.6.1" date="2021-03-03"/>
</releases>
</component>
19 changes: 10 additions & 9 deletions org.standardnotes.standardnotes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
app-id: org.standardnotes.standardnotes
branch: stable
runtime: org.freedesktop.Platform
runtime-version: "20.08"
runtime-version: '20.08'
sdk: org.freedesktop.Sdk
base: org.electronjs.Electron2.BaseApp
base-version: "20.08"
base-version: '20.08'
sdk-extensions:
- org.freedesktop.Sdk.Extension.node14
# Electron doesn't use a traditional locale format so separate-locales is useless.
Expand Down Expand Up @@ -40,15 +40,15 @@ modules:
post-install:
- chmod 644 $FLATPAK_DEST/lib/libpython2.7.so.1.0
cleanup:
- "*"
- '*'

- name: yarn
buildsystem: simple
build-commands:
- cp -a * /app
# Only used for building, so clean it up afterwards.
cleanup:
- "*"
- '*'
sources:
- type: archive
url: https://github.com/yarnpkg/yarn/releases/download/v1.22.10/yarn-v1.22.10.tar.gz
Expand All @@ -66,8 +66,8 @@ modules:
# Don't add ELECTRON_CACHE
XDG_CACHE_HOME: /run/build/standardnotes/flatpak-node/cache
npm_config_nodedir: /usr/lib/sdk/node14
npm_config_offline: "true"
npm_config_no_save: "true"
npm_config_offline: 'true'
npm_config_no_save: 'true'
npm_config_cache: /run/build/standardnotes/flatpak-node/npm-cache
npm_config_loglevel: verbose
# https://stackoverflow.com/questions/25146976/can-i-get-npm-gyp-to-use-ccache
Expand Down Expand Up @@ -117,7 +117,8 @@ modules:
- sed -i 's/"build":\ {/"build":\ {\n"npmRebuild":\ false,/' package.json

- yarn --offline bundle
- yarn --offline run electron-builder --linux dir --$npm_config_arch -c.linux.target=dir --publish=never
- yarn --offline run electron-builder --linux dir --$npm_config_arch -c.linux.target=dir
--publish=never

# Remove unneeded files
- rm dist/linux*-unpacked/chrome-sandbox
Expand All @@ -132,8 +133,8 @@ modules:
sources:
- type: git
url: https://github.com/standardnotes/desktop.git
tag: v3.6.1
commit: 397a7656c56a7453ec65d2c4fcde101674fa7874
tag: v3.6.2
commit: 8264d154113d721a6c725f7834feef67e2400ba1
x-checker-data:
type: anitya
project-id: 146681
Expand Down