mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-09-13 20:23:04 +02:00
snap: Remove framework snap prompt
Now that https://github.com/snapcore/snapcraft/pull/3596 has been released in snapcraft 6.0.1, drop the prompt that tells users to disconnect the old framework snap. Also drop --enable-experimental-extensions from CI because kde-neon has been declared stable for core20.
This commit is contained in:
parent
9bd2ea22f3
commit
782eaff4d2
2
.github/workflows/publish-edge-snap.yml
vendored
2
.github/workflows/publish-edge-snap.yml
vendored
@ -12,8 +12,6 @@ jobs:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: snapcore/action-build@v1
|
||||
id: build
|
||||
with:
|
||||
snapcraft-args: --enable-experimental-extensions
|
||||
- uses: snapcore/action-publish@v1
|
||||
with:
|
||||
store_login: ${{ secrets.STORE_LOGIN }}
|
||||
|
@ -1,17 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
# check if _only_ the correct framework snap is connected
|
||||
framework_name=$(grep "name:" $SNAP/kf5/meta/snap.yaml | cut -d" " -f2)
|
||||
if [ "$framework_name" != "kde-frameworks-5-qt-5-15-3-core20" ]; then
|
||||
downloads_dir=$(xdg-user-dir DOWNLOAD)
|
||||
test ! -d "$downloads_dir" && mkdir -p "$downloads_dir"
|
||||
instructions_file="snap.qelectrotech.update-instructions.html"
|
||||
target="$downloads_dir/$instructions_file"
|
||||
cp "$SNAP/update-instructions/$instructions_file" "$target"
|
||||
xdg-open "$target"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# migrate .qet directory from SNAP_USER_DATA to SNAP_USER_COMMON
|
||||
from="$SNAP_USER_DATA/.qet"
|
||||
to="$SNAP_USER_COMMON/.qet"
|
||||
|
File diff suppressed because one or more lines are too long
@ -56,12 +56,6 @@ parts:
|
||||
organize:
|
||||
'*': bin/
|
||||
|
||||
update-instructions:
|
||||
plugin: dump
|
||||
source: build-aux/snap/local/update-instructions
|
||||
organize:
|
||||
'*': update-instructions/
|
||||
|
||||
qet-tb-generator:
|
||||
plugin: python
|
||||
source: https://github.com/raulroda/qet_tb_generator-plugin.git
|
||||
@ -101,16 +95,14 @@ parts:
|
||||
build-packages:
|
||||
- git
|
||||
- libsqlite3-dev
|
||||
override-pull: |
|
||||
snapcraftctl pull
|
||||
override-build: |
|
||||
displayed_version=$(grep "displayedVersion" sources/qet.h | tr -d "\";" | cut -d" " -f5)
|
||||
snap_version="${displayed_version}~$(git rev-parse --short=8 HEAD)"
|
||||
snap_version="${displayed_version}-g$(git rev-parse --short=8 HEAD)"
|
||||
modified_displayed_version="${snap_version}.snap"
|
||||
sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h
|
||||
snapcraftctl set-version "$snap_version"
|
||||
override-build: |
|
||||
qmake "$SNAPCRAFT_PART_SRC/qelectrotech.pro"
|
||||
make -j$(nproc)
|
||||
make -j${SNAPCRAFT_PARALLEL_BUILD_COUNT}
|
||||
make install INSTALL_ROOT="$SNAPCRAFT_PART_INSTALL"
|
||||
override-stage: |
|
||||
snapcraftctl stage
|
||||
|
Loading…
x
Reference in New Issue
Block a user