Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump source-commit for ubuntu-desktop-bootstrap #873

Closed
wants to merge 5 commits into from
Closed

chore: bump source-commit for ubuntu-desktop-bootstrap #873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
224430d
chore: bump source-commit
github-actions[bot] Nov 20, 2024
71afa8e
chore: update subiquity stage packages
d-loose Nov 20, 2024
20d6660
chore: use core24 base
d-loose Nov 20, 2024
303aa35
fix: update ubuntu_bootstrap path to match new repo structure
d-loose Nov 20, 2024
7ab5734
ci: use snapcraft from latest/stable
d-loose Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/snap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ jobs:
with:
fetch-depth: 0
- uses: snapcore/action-build@v1
with:
snapcraft-channel: 7.x
id: snapcraft
- uses: actions/upload-artifact@v4
if: github.event_name == 'workflow_dispatch'
Expand Down
22 changes: 12 additions & 10 deletions snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ contact: https://bugs.launchpad.net/ubuntu-desktop-provision
issues: https://bugs.launchpad.net/ubuntu-desktop-provision
grade: stable
confinement: classic
base: core22
architectures:
- build-on: amd64
- build-on: arm64
base: core24
platforms:
amd64:
arm64:

apps:
subiquity-server:
Expand Down Expand Up @@ -53,7 +53,7 @@ parts:
after: [flutter-git]
plugin: nil
source: .
source-commit: &commit-ref 9675ade5a0e1b2b86d76c3699bfa6505a7ff966c
source-commit: &commit-ref 03e1840c066daa10d6a5c69f022d277c5039ed44
source-type: git
build-attributes: [enable-patchelf]
override-build: |
Expand All @@ -64,7 +64,7 @@ parts:

dart pub global activate melos
dart pub global run melos bootstrap
cd packages/ubuntu_bootstrap
cd apps/ubuntu_bootstrap
flutter build linux --release -v
cp -r build/linux/*/release/bundle/* $CRAFT_PART_INSTALL/bin/
override-prime: |
Expand All @@ -89,7 +89,7 @@ parts:
# See https://discuss.python.org/t/18240
# As a workaround, we use a fake user install to get the package
# installed in the expected place.
PYTHONUSERBASE="$CRAFT_PART_INSTALL" pip3 install --user --no-dependencies .
PYTHONUSERBASE="$CRAFT_PART_INSTALL" pip3 install --user --no-dependencies --break-system-packages .
build-packages:
- python3-pip
organize:
Expand Down Expand Up @@ -122,8 +122,8 @@ parts:
# there doesn't seem to be any real benefit to listing them separately.
- iso-codes
- libpython3-stdlib
- libpython3.10-minimal
- libpython3.10-stdlib
- libpython3.12-minimal
- libpython3.12-stdlib
- libsystemd0
- lsb-release
- ntfs-3g
Expand All @@ -135,7 +135,9 @@ parts:
- python3-distro-info
- python3-jsonschema
- python3-minimal
- python3-more-itertools
- python3-oauthlib
- python3-passlib
- python3-pkg-resources
- python3-pyroute2
- python3-pyrsistent
Expand All @@ -146,7 +148,7 @@ parts:
- python3-urwid
- python3-yaml
- python3-yarl
- python3.10-minimal
- python3.12-minimal
- ssh-import-id
- ubuntu-advantage-tools
prime:
Expand Down