diff --git a/.github/workflows/refresh-downstreams.yml b/.github/workflows/refresh-downstreams.yml index 199d904..a5c9809 100644 --- a/.github/workflows/refresh-downstreams.yml +++ b/.github/workflows/refresh-downstreams.yml @@ -3,7 +3,7 @@ name: Refresh downstreams on: push: branches: - - main + - core24 jobs: Refresh: @@ -15,8 +15,7 @@ jobs: fail-fast: false matrix: ref: - - mir-libs-build - - core24 + - mir-libs-build-core24 steps: - name: Check out code diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 433ff4a..9344980 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -13,8 +13,9 @@ description: | /snap/confined-shell/current/bin/setup.sh confinement: strict -grade: stable +grade: devel base: core24 +build-base: devel environment: SHELL: bash @@ -80,7 +81,7 @@ parts: git config --global --add safe.directory ${CRAFT_PROJECT_DIR} recipe_version=`git -C ${CRAFT_PROJECT_DIR} rev-list --count HEAD` craftctl set version=$server_version-mir$mir_version-snap$recipe_version - if echo $mir_version | grep -e '+dev' -e '~rc' -q; then craftctl set grade=devel; else craftctl set grade=stable; fi + # if echo $mir_version | grep -e '+dev' -e '~rc' -q; then craftctl set grade=devel; else craftctl set grade=stable; fi plugin: cmake build-packages: - build-essential @@ -206,12 +207,12 @@ plugs: gpu-2404: interface: content target: $SNAP/gpu - default-provider: mesa-2404 + # default-provider: mesa-2404 -platforms: - amd64: - arm64: - armhf: +architectures: + - build-on: amd64 + - build-on: arm64 + - build-on: armhf package-repositories: - type: apt