Skip to content

Commit

Permalink
CI: build snap packages with stockdotnet6+xbuild
Browse files Browse the repository at this point in the history
  • Loading branch information
aarani committed Aug 21, 2023
1 parent 3e4e51d commit 69fe045
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 12 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -634,18 +634,17 @@ jobs:
needs:
- conventions

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v1
- name: Install snap tools
run: |
sudo apt update
sudo ./scripts/install_mono_from_microsoft_deb_packages.sh
./scripts/install_snapcraft.sh
# hack to disable dotnet detection (can't use apt purge because github VM seems to have it installed in different way)
- name: HACK to emulate dotnet uninstall
run: sudo rm `which dotnet`
- name: HACK to emulate msbuild uninstall
run: sudo rm `which msbuild`

- name: Generate snap package
run: |
Expand Down
2 changes: 1 addition & 1 deletion scripts/snap_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -euxo pipefail

# this is the equivalent of using the 'build-packages' (not stage-packages) section in snapcraft
# but as we're not using the 'make' plugin, we need to this manually now
DEBIAN_FRONTEND=noninteractive sudo apt install -y fsharp build-essential pkg-config cli-common-dev mono-devel libgtk2.0-cil-dev
DEBIAN_FRONTEND=noninteractive sudo apt install -y fsharp build-essential pkg-config cli-common-dev mono-xbuild libgtk2.0-cil-dev dotnet6


./configure.sh --prefix=./staging
Expand Down
2 changes: 1 addition & 1 deletion scripts/snap_build_and_upload_as_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ docker exec snappy make install

# Install snapcraft and dependencies
docker exec snappy snap version
docker exec snappy snap install core20
docker exec snappy snap install core22
docker exec snappy snap install --classic --stable snapcraft
docker exec snappy snapcraft --version

Expand Down
2 changes: 0 additions & 2 deletions scripts/snap_install_as_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,5 @@ echo " done"
$SUDO docker exec $CONTNAME snap install core || clean_up
echo "container $CONTNAME started ..."

$SUDO docker exec $CONTNAME scripts/install_mono_from_microsoft_deb_packages.sh

print_info
rm_builddir
7 changes: 3 additions & 4 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: geewallet
base: core20 # the base snap is the execution environment for this snap
version: '0.4.381.0' # just for humans, typically '1.2+git' or '1.3.2'
base: core22 # the base snap is the execution environment for this snap
version: "0.4.381.0" # just for humans, typically '1.2+git' or '1.3.2'
summary: minimalistic cryptocurrency brainwallet # 79 char long summary
description: |
Non-custodial, minimalistic and pragmatist opensource crossplatform
Expand Down Expand Up @@ -50,8 +50,7 @@ parts:
build-packages:
- libgtk2.0-dev
stage-packages:
- libxkbcommon0 # XKB_CONFIG_ROOT
- ttf-ubuntu-font-family
- libxkbcommon0 # XKB_CONFIG_ROOT
- dmz-cursor-theme
- light-themes
- adwaita-icon-theme
Expand Down

0 comments on commit 69fe045

Please sign in to comment.