aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--RELEASE.md2
-rw-r--r--snap/snapcraft.yaml16
2 files changed, 7 insertions, 11 deletions
diff --git a/RELEASE.md b/RELEASE.md
index 824c9467..19120468 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -44,7 +44,7 @@ Make sure snapcraft packaging works. In `snap/snapcraft.yaml`:
- [ ] The `tor`, `libevent`, and `obfs4` parts should be updated if necessary
- [ ] All python packages in the `onionshare` part should be updated to match `desktop/pyproject.toml`
-- [ ] Test the snap package, ensure it works
+- [ ] With every commit to the `develop` branch, Snapcraft's CI should trigger builds. Make sure the builds all succeeded at https://snapcraft.io/onionshare/builds (you must be logged in), and test them
Update to the latest version of Tor:
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 5c85f6d4..9a0f8f77 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -151,13 +151,11 @@ parts:
obfs4:
plugin: go
- go-importpath: gitlab.com/yawning/obfs4
- source: https://gitlab.com/yawning/obfs4
+ source: https://gitlab.com/yawning/obfs4.git
source-type: git
snowflake-client:
plugin: go
- go-importpath: git.torproject.org/pluggable-transports/snowflake.git/client
source: https://git.torproject.org/pluggable-transports/snowflake.git
source-type: git
source-tag: v2.2.0
@@ -166,13 +164,11 @@ parts:
meek-client:
plugin: go
- go-channel: stable
- go-importpath: git.torproject.org/pluggable-transports/meek.git/meek-client
- # Not sure why I have to do this, but it works
- override-build: |
- cd meek-client
- mkdir /root/parts/meek-client/install/bin
- go build -o /root/parts/meek-client/install/bin/meek-client ./...
source: https://git.torproject.org/pluggable-transports/meek.git
source-type: git
source-tag: v0.37.0
+ # # Not sure why I have to do this, but it works
+ # override-build: |
+ # cd meek-client
+ # mkdir /root/parts/meek-client/install/bin
+ # go build -o /root/parts/meek-client/install/bin/meek-client ./...