diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | branding/templates/makefile/Makefile | 1 | ||||
| -rw-r--r-- | branding/templates/snap/docs/launchpad.rst | 13 | ||||
| -rw-r--r-- | branding/templates/snap/docs/release.rst | 59 | ||||
| -rw-r--r-- | gui/providers/providers.json | 4 |
5 files changed, 5 insertions, 75 deletions
@@ -193,6 +193,7 @@ gen_pkg_snap: @rm build/${PROVIDER}/snap/data.json build/${PROVIDER}/snap/snapcraft-template.yaml @mkdir -p build/${PROVIDER}/snap/gui && cp branding/assets/default/icon.svg build/${PROVIDER}/snap/gui/icon.svg @cp branding/assets/default/icon.png build/${PROVIDER}/snap/gui/${PROVIDER}-vpn.png + rm build/${PROVIDER}/snap/generate.py gen_pkg_deb: @cp -r ${TEMPLATES}/debian build/${PROVIDER} @@ -221,6 +222,8 @@ package_win_in_docker: @make -C docker package_win package_snap: + @unlink snap || true + @ln -s build/${PROVIDER}/snap snap @make -C build/${PROVIDER} pkg_snap package_deb: diff --git a/branding/templates/makefile/Makefile b/branding/templates/makefile/Makefile index b4faa60..1c4083f 100755 --- a/branding/templates/makefile/Makefile +++ b/branding/templates/makefile/Makefile @@ -86,7 +86,6 @@ pkg_snap: -@mkdir -p ../../deploy @echo "[+] building snap..." cd ../..; \ - ln -s build/$(PROVIDER)/snap snap; \ snapcraft build; \ snapcraft snap -@rm ../../snap diff --git a/branding/templates/snap/docs/launchpad.rst b/branding/templates/snap/docs/launchpad.rst deleted file mode 100644 index 0a614f6..0000000 --- a/branding/templates/snap/docs/launchpad.rst +++ /dev/null @@ -1,13 +0,0 @@ -launchpad -========= -In launchpad, you need to configure a git source for your project, and define a snap recipe for that source. - -Be warned that launchpad does an automatic import every 6 hours. - -If you need to do manual builds, you first need to trigger an import. Look for the "import now" button in your source page: - -https://code.launchpad.net/~leapsnaps/riseupvpn/+git/riseup_vpn - -Then you can trigger a manual build: - -https://code.launchpad.net/~leapsnaps/+snap/riseup-vpn/+request-builds diff --git a/branding/templates/snap/docs/release.rst b/branding/templates/snap/docs/release.rst deleted file mode 100644 index 5211aea..0000000 --- a/branding/templates/snap/docs/release.rst +++ /dev/null @@ -1,59 +0,0 @@ -Automatic builds (snap) -~~~~~~~~~~~~~~~~~~~~~~~ -Gitlab builds snap for amd64 for every push to master in bitmask-systray. - -Launchpad does up 4 daily builds if code is modified in bitmask-dev repo. We're -building for amd64 and i386. They are pushed to beta channel in the snap store. -If you need to force a build, trigger it by editing the version string in the -snapcraft.yaml file. - -Releasing snaps ----------------- - -From the snap dashboard, you can see the revisions that are built. -By default, we have riseupvpn-builds configured to upload builds to beta and -edge channels. If you are going to be pushing to edge manually regularly, -please configure the automated builds to push just to beta for some time and -push your builds to edge channel. - -To publish a snap, click on "release" from the dashboard, and assign a channel to them. - -By convention, if you release to a channel, please release the revision to all -the lower channels too. (For example, if you release a particular revision to -"candidate", release it also to "beta" and "edge"). - -Do note that the automated builds for different architectures do have different revision -numbers, so when releasing you have to repeat the steps for each platform that -we're building for. - -From the command line: - - snapcraft login - snapcraft status riseup-vpn - - # if we've built a release manually, we have to push it first. it gives us a - # revision number that we use in the next step. - - snapcraft push riseup-vpn_0.10.6+git_amd64.snap - Preparing to push '/home/kali/leap/bitmask-dev/riseup-vpn_0.10.6+git_amd64.snap' to the store. - Found cached source snap /home/kali/.cache/snapcraft/projects/riseup-vpn/snap_hashes/amd64/b5e9d106c823e3c83fce1ef81ad95d68c33fcada859eeb98233fc766863d39205c192fe5ee53def71c43886e40d3ab5b. - Generating xdelta3 delta for riseup-vpn_0.10.6+git_amd64.snap. - Pushing delta /home/kali/leap/bitmask-dev/riseup-vpn_0.10.6+git_amd64.snap.xdelta3. - Pushing riseup-vpn_0.10.6+git_amd64.snap.xdelta3 [=================================================] 100% - Processing...| - Ready to release! - Revision 20 of 'riseup-vpn' created. - - # otherwise I assume that you're just trying to release something - # that was already built and automatically uploaded. - - # let's publish amd64 to candidate channel and the channels below - snapcraft release riseupv-vpn 20 candidate - snapcraft release riseupv-vpn 20 beta - snapcraft release riseupv-vpn 20 edge - - # and now the i386 build - snapcraft release riseupv-vpn 19 candidate - snapcraft release riseupv-vpn 19 beta - snapcraft release riseupv-vpn 19 edge - diff --git a/gui/providers/providers.json b/gui/providers/providers.json index d27a11c..e0c2d82 100644 --- a/gui/providers/providers.json +++ b/gui/providers/providers.json @@ -10,7 +10,7 @@ "providerURL": "riseup.net", "tosURL": "https://riseup.net/tos", "helpURL": "https://riseup.net/support", - "askForDonations": "true", + "askForDonations": true, "donateURL": "https://riseup.net/vpn/donate", "apiURL": "https://api.black.riseup.net/", "geolocationAPI": "https://api.black.riseup.net:9001/json", @@ -18,4 +18,4 @@ "timeStamp": "2020-10-06 18:29:40" } ] -}
\ No newline at end of file +} |