From 782eaff4d2aab69271ca9b848a4fef9994a37ba9 Mon Sep 17 00:00:00 2001 From: Maximilian Federle Date: Thu, 13 Jan 2022 10:10:00 +0100 Subject: [PATCH] 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. --- .github/workflows/publish-edge-snap.yml | 2 - .../snap/local/launchers/qelectrotech-launch | 12 ----- ...snap.qelectrotech.update-instructions.html | 46 ------------------- build-aux/snap/snapcraft.yaml | 16 ++----- 4 files changed, 4 insertions(+), 72 deletions(-) delete mode 100644 build-aux/snap/local/update-instructions/snap.qelectrotech.update-instructions.html diff --git a/.github/workflows/publish-edge-snap.yml b/.github/workflows/publish-edge-snap.yml index 850e23635..52d569820 100644 --- a/.github/workflows/publish-edge-snap.yml +++ b/.github/workflows/publish-edge-snap.yml @@ -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 }} diff --git a/build-aux/snap/local/launchers/qelectrotech-launch b/build-aux/snap/local/launchers/qelectrotech-launch index 8704e6c4f..d56bcfdcd 100755 --- a/build-aux/snap/local/launchers/qelectrotech-launch +++ b/build-aux/snap/local/launchers/qelectrotech-launch @@ -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" diff --git a/build-aux/snap/local/update-instructions/snap.qelectrotech.update-instructions.html b/build-aux/snap/local/update-instructions/snap.qelectrotech.update-instructions.html deleted file mode 100644 index fe4a32660..000000000 --- a/build-aux/snap/local/update-instructions/snap.qelectrotech.update-instructions.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - QElectroTech: Manual Intervention Required - - -
-
- -
-

Manual Intervention Required

- -

QElectroTech has been updated and uses newer versions - of many software packages now.

- -

Unfortunately, this requires a one time manual step from you to - complete the update.

- -
    -
  1. Open a terminal
    2. -
  2. Run the following command:
    3. -
    - - sudo snap disconnect qelectrotech:kde-frameworks-5-plug kde-frameworks-5-core18:kde-frameworks-5-core18-slot - -
    -
-

- This will disconnect the outdated software from QElectroTech and will - enable the application to run with the new platform. -

- -

- Your data will not be affected! This command will not delete anything. -

- -

- Thank you,
- the QElectroTech developers -

- -
- - \ No newline at end of file diff --git a/build-aux/snap/snapcraft.yaml b/build-aux/snap/snapcraft.yaml index d7c80a71e..400672286 100644 --- a/build-aux/snap/snapcraft.yaml +++ b/build-aux/snap/snapcraft.yaml @@ -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 @@ -82,7 +76,7 @@ parts: - rsync override-build: | rsync -a --ignore-existing /snap/kde-frameworks-5-qt-5-15-3-core20-sdk/current/ / - + dxf-to-qet: after: [kde-sdk-setup] plugin: nil @@ -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