Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: solvespace/solvespace
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3ed1719de2dc
Choose a base ref
...
head repository: solvespace/solvespace
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 65ab59503acd
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Feb 8, 2020

  1. snap: Build snaps on Travis without remote-build & drop i386 + armhf 

    Snapcraft's remote-build does not fit the requirements of CI,
so replace it with builds running directly on Travis:

1. Builds on Travis can run independently, whereas remote-build
competes for the same resource (Launchpad) and will potentially
block if multiple commits require building in succession.
2. Snapcrafts CLI for remote-build is not designed to be easily
scriptable.
3. Travis recently introduced building on arm64, so builds for
arm64 are now very fast and don't require emulation.

We do not build for armhf and i386 any more because they are
of little relevance on the desktop.
    @ppd @whitequark
    ppd authored and whitequark committed Feb 8, 2020
    4
    Copy the full SHA
    65ab595 View commit details
Showing with 12 additions and 19 deletions.
  1. +10 −6 .travis.yml
  2. +2 −13 .travis/build-snap.sh
  3. BIN .travis/launchpad-credentials.enc
16 changes: 10 additions & 6 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -25,14 +25,16 @@ jobs:
on:
repo: solvespace/solvespace
tags: true
- stage: deploy
name: "Snap"
- &deploy-snap
stage: deploy
name: Snap amd64
os: linux
arch: amd64
dist: bionic
addons:
snaps:
- name: snapcraft
confinement: classic
snaps:
- name: snapcraft
confinement: classic
script: ./.travis/build-snap.sh
deploy:
- provider: script
@@ -47,4 +49,6 @@ jobs:
on:
branch: master
tags: true

- <<: *deploy-snap
name: Snap arm64
arch: arm64
15 changes: 2 additions & 13 deletions .travis/build-snap.sh
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,4 @@
#!/bin/sh -xe

lp_data_dir="$HOME/.local/share/snapcraft/provider/launchpad"
lp_credentials="$lp_data_dir/credentials"

mkdir -p "$lp_data_dir"
openssl aes-256-cbc -K $encrypted_c4bc81f026a2_key -iv $encrypted_c4bc81f026a2_iv \
-in .travis/launchpad-credentials.enc \
-out "$lp_credentials" -d
chmod 600 "$lp_credentials"

./pkg/snap/build.sh remote-build \
--launchpad-user solvespace \
--launchpad-accept-public-upload \
--build-on=amd64,arm64,armhf,i386
sudo apt-get update
sudo ./pkg/snap/build.sh --destructive-mode
Binary file removed .travis/launchpad-credentials.enc
View file
Binary file not shown.