Skip to content

Commit

Permalink
snap: use snapcore/action-build for candidate builds (#1566)
Browse files Browse the repository at this point in the history
* snap: update to use core22

* snap: use snapcore/action-build to build
  • Loading branch information
andrewsomething authored Aug 12, 2024
1 parent 722dd35 commit 50ad772
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 15 deletions.
10 changes: 1 addition & 9 deletions .github/workflows/snapcraft-candidate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,9 @@ jobs:
# fetch-depth: 0 fetches all history for all branches and tags
fetch-depth: 0

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build snap
uses: snapcore/action-build@v1
id: build
run: |
make _build_snap && \
find doctl_v*.snap -exec echo "snap={}" >> "$GITHUB_OUTPUT" \;

- uses: snapcore/action-publish@master
env:
Expand Down
13 changes: 7 additions & 6 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description: |
clusters, firewalls, load balancers, database clusters, domains, and more.
license: Apache-2.0

base: core20
base: core22
grade: stable
confinement: strict

Expand All @@ -24,22 +24,23 @@ parts:
override-build: |
cd $SNAPCRAFT_PART_BUILD
chmod +x doctl-launch
snapcraftctl build
craftctl default
doctl:
after: [launcher]
source: .
source: https://github.com/digitalocean/doctl
source-type: git
plugin: go
build-snaps: [go/latest/stable]
build-environment:
# Results in installation to /snap/doctl/current/opt/sandbox
- OVERRIDE_SANDBOX_DIR: "$SNAPCRAFT_PART_INSTALL/opt/sandbox"
- SNAP_SANDBOX_INSTALL: "true"
# Override to prevent 'invalid cross-device link' calling doctl
- XDG_CONFIG_HOME: "$SNAPCRAFT_PART_INSTALL/tmp/.config"
override-pull: |
git clone https://github.com/digitalocean/doctl.git .
override-build: |
version=$(scripts/version.sh --snap)
snapcraftctl set-version ${version}
craftctl set version=${version}
echo "==> Building doctl ${version} using $(go version)"
Expand Down

0 comments on commit 50ad772

Please sign in to comment.