diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 018489b3..dd631056 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -254,7 +254,7 @@ jobs: - name: Flatpak build run: | cd flatpak - flatpak-builder build --force-clean --keep-build-dirs --verbose --install-deps-from=flathub --install --user org.onionshare.OnionShare.yaml + flatpak-builder build --force-clean --verbose --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@v4 diff --git a/flatpak/org.onionshare.OnionShare.yaml b/flatpak/org.onionshare.OnionShare.yaml index 49725da9..9d807260 100644 --- a/flatpak/org.onionshare.OnionShare.yaml +++ b/flatpak/org.onionshare.OnionShare.yaml @@ -59,16 +59,6 @@ modules: - type: archive url: https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz sha256: 92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb - - name: obfs4proxy - buildsystem: simple - build-options: - build-args: - - --share=network - build-commands: - - ". /usr/lib/sdk/golang/enable.sh; export GOPATH=$PWD; export GO111MODULE=on; cd desktop && ./scripts/build-pt-obfs4proxy.sh && mv onionshare/resources/tor/obfs4proxy /app/bin/obfs4proxy" - sources: - - type: dir - path: .. - name: meek-client buildsystem: simple build-options: @@ -76,6 +66,7 @@ modules: - --share=network build-commands: - ". /usr/lib/sdk/golang/enable.sh; export GOPATH=$PWD; export GO111MODULE=on; cd desktop && ./scripts/build-pt-meek.sh && mv onionshare/resources/tor/meek-client /app/bin/meek-client" + - "ls -aR $FLATPAK_BUILDER_BUILDDIR" sources: - type: dir path: .. @@ -86,6 +77,18 @@ modules: - --share=network build-commands: - ". /usr/lib/sdk/golang/enable.sh; export GOPATH=$PWD; export GO111MODULE=on; cd desktop && ./scripts/build-pt-snowflake.sh && mv onionshare/resources/tor/snowflake-client /app/bin/snowflake-client" + - "ls -aR $FLATPAK_BUILDER_BUILDDIR" + sources: + - type: dir + path: .. + - name: obfs4proxy + buildsystem: simple + build-options: + build-args: + - --share=network + build-commands: + - ". /usr/lib/sdk/golang/enable.sh; export GOPATH=$PWD; export GO111MODULE=on; cd desktop && ./scripts/build-pt-obfs4proxy.sh && mv onionshare/resources/tor/obfs4proxy /app/bin/obfs4proxy" + - "ls -aR $FLATPAK_BUILDER_BUILDDIR" sources: - type: dir path: ..