Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build updates #6905

Merged
merged 2 commits into from
May 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions build/debian/build-snap.sh

This file was deleted.

14 changes: 0 additions & 14 deletions build/debian/makedist_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ python3 -m PyInstaller tribler.spec --log-level=DEBUG
cp -r dist/tribler build/debian/tribler/usr/share/tribler

TRIBLER_VERSION=$(cat .TriblerVersion)
sed -i "s/__VERSION__/$TRIBLER_VERSION/g" build/debian/snap/snapcraft.yaml

pushd build/debian/tribler || exit
# Compose the changelog
Expand All @@ -43,16 +42,3 @@ dch -v $TRIBLER_VERSION "See https://github.com/Tribler/tribler/releases/tag/$TR
# Build the package afterwards
dpkg-buildpackage -b -rfakeroot -us -uc
popd || exit

# Build Tribler snap if $BUILD_TRIBLER_SNAP
if [ "$BUILD_TRIBLER_SNAP" == "false" ]; then
exit 0
fi

# Build snap with docker if exists
if [ -x "$(command -v docker)" ]; then
echo "Running snapcraft in docker"
cd build/debian && docker run -v "$PWD":/debian -w /debian triblertester/snap_builder:core18 /bin/bash ./build-snap.sh
else
cd build/debian && /bin/bash ./build-snap.sh
fi
114 changes: 0 additions & 114 deletions build/debian/snap/snapcraft.yaml

This file was deleted.

1 change: 1 addition & 0 deletions requirements-build.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@

PyInstaller==5.0.1
defusedxml==0.7.1; sys_platform == 'linux2' or sys_platform == 'linux'
markupsafe==2.0.1; sys_platform == 'linux2' or sys_platform == 'linux'
requests==2.25.1