Stop overriding build

.github/workflows/build.yml

@@ -1,14 +1,14 @@
-name: Build
-run-name: Build win32, win64, mac (Intel), snap (amd64) 🚀
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
+# name: Build
+# run-name: Build win32, win64, mac (Intel), snap (amd64) 🚀
+# on:
+#   push:
+#     branches:
+#       - main
+#   pull_request:
+#     branches:
+#       - main
 
-jobs:
+# jobs:
 #   build-win64:
 #     runs-on: windows-latest
 #     steps:
@@ -305,7 +305,7 @@ jobs:
 #           name: mac-build
 #           path: ~/onionshare-macos.tar.gz
 
-  build-snap-amd64:
+  build-snap:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -332,36 +332,36 @@ jobs:
           name: flatpak-build
           path: ~/onionshare_amd64.snap
 
-  build-flatpak:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
+#   build-flatpak:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@v3
       
-      - name: Setup
-        run: |
-          sudo apt update
-          sudo apt install -y flatpak flatpak-builder
-          flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
+#       - name: Setup
+#         run: |
+#           sudo apt update
+#           sudo apt install -y flatpak flatpak-builder
+#           flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
       
-      - name: Restore cache - .flatpak-builder
-        uses: actions/cache@v3
-        with:
-          path: flatpak/.flatpak-builder
-          key: flatpak-.flatpak-builder
+#       - name: Restore cache - .flatpak-builder
+#         uses: actions/cache@v3
+#         with:
+#           path: flatpak/.flatpak-builder
+#           key: flatpak-.flatpak-builder
 
-      - name: Restore cache - build
-        uses: actions/cache@v3
-        with:
-          path: flatpak/build
-          key: flatpak-build
+#       - name: Restore cache - build
+#         uses: actions/cache@v3
+#         with:
+#           path: flatpak/build
+#           key: flatpak-build
 
-      - name: Flatpak build
-        run: |
-          cd flatpak
-          flatpak-builder build --force-clean --install-deps-from=flathub --install --user org.onionshare.OnionShare.yaml
-          flatpak build-bundle ~/.local/share/flatpak/repo ~/OnionShare.flatpak org.onionshare.OnionShare --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
+#       - name: Flatpak build
+#         run: |
+#           cd flatpak
+#           flatpak-builder build --force-clean --install-deps-from=flathub --install --user org.onionshare.OnionShare.yaml
+#           flatpak build-bundle ~/.local/share/flatpak/repo ~/OnionShare.flatpak org.onionshare.OnionShare --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
 
-      - uses: actions/upload-artifact@v3
-        with:
-          name: flatpak-build
-          path: ~/OnionShare.flatpak
+#       - uses: actions/upload-artifact@v3
+#         with:
+#           name: flatpak-build
+#           path: ~/OnionShare.flatpak

snap/snapcraft.yaml

@@ -50,8 +50,6 @@ parts:
     python-packages:
       - qrcode
       - pyside2 == 5.15.2.1
-    override-build: |
-      python3 setup.py install --prefix $SNAPCRAFT_PART_INSTALL
     stage-packages:
       - libasound2
       - libatk1.0-0
@@ -138,8 +136,6 @@ parts:
       - colorama
       - gevent-websocket
       - stem==1.8.1
-    override-build: |
-      python3 setup.py install --prefix $SNAPCRAFT_PART_INSTALL
     after: [tor, obfs4, snowflake-client, meek-client]
 
   tor: