Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1915 from onionshare/update-pluggable-transport-links

Browse Source 
Updates the git links to the pluggable transport in flatpak config
This commit is contained in:
Micah Lee 2024-08-23 08:44:34 -07:00 committed by GitHub
commit a78ce517d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/build.yml vendored
View File

@ -127,7 +127,7 @@ jobs:
- name: Install poetry - name: Install poetry
run: | run: |
python3 -m pip install poetry curl -sSL https://install.python-poetry.org | python3 -
- name: Restore cache - poetry - name: Restore cache - poetry
uses: actions/cache@v3 uses: actions/cache@v3
@ -138,7 +138,7 @@ jobs:
- name: Install poetry dependencies - name: Install poetry dependencies
run: | run: |
cd desktop cd desktop
/Library/Frameworks/Python.framework/Versions/3.11/bin/poetry install ~/Library/Application\ Support/pypoetry/venv/bin/poetry install
- name: Restore cache - tor - name: Restore cache - tor
uses: actions/cache@v3 uses: actions/cache@v3
@ -149,7 +149,7 @@ jobs:
- name: Get tor binaries from Tor Browser - name: Get tor binaries from Tor Browser
run: | run: |
cd desktop cd desktop
/Library/Frameworks/Python.framework/Versions/3.11/bin/poetry run python ./scripts/get-tor.py macos ~/Library/Application\ Support/pypoetry/venv/bin/poetry run python ./scripts/get-tor.py macos
- name: Install Go >=1.21.1 - name: Install Go >=1.21.1
uses: actions/setup-go@v4 uses: actions/setup-go@v4
@ -215,10 +215,8 @@ jobs:
- name: Build OnionShare - name: Build OnionShare
run: | run: |
cd desktop cd desktop
/Library/Frameworks/Python.framework/Versions/3.11/bin/poetry run python ./setup-freeze.py bdist_mac ~/Library/Application\ Support/pypoetry/venv/bin/poetry run python ./setup-freeze.py bdist_mac
rm -rf build/OnionShare.app/Contents/Resources/lib ~/Library/Application\ Support/pypoetry/venv/bin/poetry run python ./scripts/build-macos.py cleanup-build
mv build/exe.macosx-10.9-universal2-3.11/lib build/OnionShare.app/Contents/Resources/
/Library/Frameworks/Python.framework/Versions/3.11/bin/poetry run python ./scripts/build-macos.py cleanup-build
- name: Compress - name: Compress
run: | run: |

4
RELEASE.md
View File

@ -100,8 +100,8 @@ In `flatpak/org.onionshare.OnionShare.yaml`:
# For each these, incorporate the output into the Flatpak manifest # For each these, incorporate the output into the Flatpak manifest
# Make sure to update the version numbers # Make sure to update the version numbers
./flatpak-go-deps.py git.torproject.org/pluggable-transports/meek.git/meek-client@v0.38.0 ./flatpak-go-deps.py gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/meek.git/meek-client@v0.38.0
./flatpak-go-deps.py git.torproject.org/pluggable-transports/snowflake.git/client@v2.6.0 ./flatpak-go-deps.py gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git/client@v2.6.0
./flatpak-go-deps.py gitlab.com/yawning/obfs4.git/obfs4proxy@obfs4proxy-0.0.14 ./flatpak-go-deps.py gitlab.com/yawning/obfs4.git/obfs4proxy@obfs4proxy-0.0.14
``` ```
Merge the output of each of these commands into the Flatpak manifest. Merge the output of each of these commands into the Flatpak manifest.

2
desktop/scripts/build-pt-meek.ps1
View File

@ -2,7 +2,7 @@ $env:MEEK_TAG = 'v0.38.0'
New-Item -ItemType Directory -Force -Path .\build\meek New-Item -ItemType Directory -Force -Path .\build\meek
cd .\build\meek cd .\build\meek
git clone https://git.torproject.org/pluggable-transports/meek.git git clone https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/meek.git
cd meek cd meek
git checkout $MEEK_TAG git checkout $MEEK_TAG
go build .\meek-client go build .\meek-client

2
desktop/scripts/build-pt-meek.sh
View File

@ -5,7 +5,7 @@ OS=$(uname -s)
mkdir -p ./build/meek mkdir -p ./build/meek
cd ./build/meek cd ./build/meek
git clone https://git.torproject.org/pluggable-transports/meek.git || echo "already cloned" git clone https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/meek.git || echo "already cloned"
cd meek cd meek
git checkout $MEEK_TAG git checkout $MEEK_TAG

2
desktop/scripts/build-pt-snowflake.ps1
View File

@ -2,7 +2,7 @@ $env:SNOWFLAKE_TAG = 'v2.8.1'
New-Item -ItemType Directory -Force -Path .\build\snowflake New-Item -ItemType Directory -Force -Path .\build\snowflake
cd .\build\snowflake cd .\build\snowflake
git clone https://git.torproject.org/pluggable-transports/snowflake.git git clone https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git
cd snowflake cd snowflake
git checkout $SNOWFLAKE_TAG git checkout $SNOWFLAKE_TAG
go build .\client go build .\client

2
desktop/scripts/build-pt-snowflake.sh
View File

@ -5,7 +5,7 @@ OS=$(uname -s)
mkdir -p ./build/snowflake mkdir -p ./build/snowflake
cd ./build/snowflake cd ./build/snowflake
git clone https://git.torproject.org/pluggable-transports/snowflake.git || echo "already cloned" git clone https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git || echo "already cloned"
cd snowflake cd snowflake
git checkout $SNOWFLAKE_TAG git checkout $SNOWFLAKE_TAG
if [ "$OS" == "Darwin" ]; then if [ "$OS" == "Darwin" ]; then

10
flatpak/org.onionshare.OnionShare.yaml
View File

@ -105,7 +105,7 @@ modules:
commit: 8c58ed0e35502a485538e4c5ec086070840f3410 commit: 8c58ed0e35502a485538e4c5ec086070840f3410
dest: src/filippo.io/edwards25519 dest: src/filippo.io/edwards25519
- type: git - type: git
url: https://git.torproject.org/pluggable-transports/goptlib url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib
commit: 13b7b3552e1eef32e4d8a2a7813f22488f91dc09 commit: 13b7b3552e1eef32e4d8a2a7813f22488f91dc09
dest: src/git.torproject.org/pluggable-transports/goptlib.git dest: src/git.torproject.org/pluggable-transports/goptlib.git
- type: git - type: git
@ -141,11 +141,11 @@ modules:
commit: faf0a1b62c6b439486fd1d914d8185627b99d387 commit: faf0a1b62c6b439486fd1d914d8185627b99d387
dest: src/golang.org/x/sys dest: src/golang.org/x/sys
- type: git - type: git
url: https://git.torproject.org/pluggable-transports/goptlib url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib
commit: 13b7b3552e1eef32e4d8a2a7813f22488f91dc09 commit: 13b7b3552e1eef32e4d8a2a7813f22488f91dc09
dest: src/git.torproject.org/pluggable-transports/goptlib.git dest: src/git.torproject.org/pluggable-transports/goptlib.git
- type: git - type: git
url: https://git.torproject.org/pluggable-transports/meek url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/meek
commit: 6600c52acb7979b08dd0916a7a779dd0e5dde0b0 commit: 6600c52acb7979b08dd0916a7a779dd0e5dde0b0
dest: src/git.torproject.org/pluggable-transports/meek.git dest: src/git.torproject.org/pluggable-transports/meek.git
- type: git - type: git
@ -182,11 +182,11 @@ modules:
commit: 5ec99f83aff198f5fbd629d6c8d8eb38a04218ca commit: 5ec99f83aff198f5fbd629d6c8d8eb38a04218ca
dest: src/golang.org/x/xerrors dest: src/golang.org/x/xerrors
- type: git - type: git
url: https://git.torproject.org/pluggable-transports/goptlib url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib
commit: 13b7b3552e1eef32e4d8a2a7813f22488f91dc09 commit: 13b7b3552e1eef32e4d8a2a7813f22488f91dc09
dest: src/git.torproject.org/pluggable-transports/goptlib.git dest: src/git.torproject.org/pluggable-transports/goptlib.git
- type: git - type: git
url: https://git.torproject.org/pluggable-transports/snowflake url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake
commit: 36f03dfd4483922b3e7400dedc71df9cf2f30b6b commit: 36f03dfd4483922b3e7400dedc71df9cf2f30b6b
dest: src/git.torproject.org/pluggable-transports/snowflake.git dest: src/git.torproject.org/pluggable-transports/snowflake.git
- type: git - type: git