@@ -141,83 +141,58 @@ jobs:
141141 echo Downloading $file...
142142 dir=cli
143143 if [[ $file =~ gui ]]; then
144- dir=gui
144+ dir=gui_files
145145 fi
146146 url=https://dlsrc.getmonero.org/${dir}/${file}
147147 curl -sLO $url
148148 done
149149 - name : Verify hashes.txt hashes
150150 run : |
151151 grep monero- downloads/hashes.txt | sha256sum -c
152- - name : Verify downloads.yml hashes
153- run : |
154- yq -r '.[] | .[0].downloads[] | "\(.link)|\(.hash)"' _data/downloads.yml | grep -v github |
155- while read line; do
156- [ -z "$line" ] && continue
157- url=$(echo $line | cut -d'|' -f1)
158- [[ "$url" == *torrent ]] && continue
159- hash=$(echo $line | cut -d'|' -f2)
160- filename=
161- case $url in
162- *gui/win64install) filename=monero-gui-install-win-x64 ;;
163- *gui/win64) filename=monero-gui-win-x64 ;;
164- *gui/mac64) filename=monero-gui-mac-x64 ;;
165- *gui/macarm8) filename=monero-gui-mac-armv8 ;;
166- *gui/linux64) filename=monero-gui-linux-x64 ;;
167- *gui/source) filename=monero-gui-source ;;
168- *cli/win64) filename=monero-win-x64 ;;
169- *cli/win32) filename=monero-win-x86 ;;
170- *cli/mac64) filename=monero-mac-x64 ;;
171- *cli/macarm8) filename=monero-mac-armv8 ;;
172- *cli/linux64) filename=monero-linux-x64 ;;
173- *cli/linux32) filename=monero-linux-x86 ;;
174- *cli/linuxarm8) filename=monero-linux-armv8 ;;
175- *cli/linuxarm7) filename=monero-linux-armv7 ;;
176- *cli/linuxriscv64) filename=monero-linux-riscv64 ;;
177- *cli/androidarm8) filename=monero-android-armv8 ;;
178- *cli/androidarm7) filename=monero-android-armv7 ;;
179- *cli/freebsd64) filename=monero-freebsd-x64 ;;
180- *cli/source) filename=monero-source ;;
181- *)
182- echo "Unknown url $url" >&2
183- exit 1
184- ;;
185- esac
186- filename=$(awk "/${filename}/ {print \$2}" downloads/hashes.txt)
187- echo "$hash $filename" | sha256sum -c
188- done
189- - name : Validate source integrity
152+ - name : Verify torrent magnet links
190153 run : |
154+ sudo apt-get install -y --no-install-recommends transmission-cli
155+
191156 version_gui=$(awk '/monero-gui-source-v/ {print $2}' downloads/hashes.txt | awk -F".tar.bz2" '{print $1}' | awk -F"-" '{print $4}')
192157 version_cli=$(awk '/monero-source-v/ {print $2}' downloads/hashes.txt | awk -F".tar.bz2" '{print $1}' | awk -F"-" '{print $3}')
193- echo -e "\n--> GUI version: $version_gui \n--> CLI version: $version_cli"
194- mkdir validate_sources
195- cd validate_sources
196- # Download / verify git-archive-all.sh
197- curl -O https://raw.githubusercontent.com/fabacab/git-archive-all.sh/fc86194f00b678438f9210859597f6eead28e765/git-archive-all.sh
198- echo "db62e9a824866989c9d080f008ec06d81421cf94bed3762acba3b9148607af2d git-archive-all.sh" | sha256sum -c
199- chmod +x git-archive-all.sh
200- echo -e "--> Generating tarballs..."
201- # CLI
202- git clone --recursive -b $version_cli --depth 1 --shallow-submodule https://github.com/monero-project/monero.git monero.git && cd monero.git && ../git-archive-all.sh --prefix monero-source-${version_cli}/ --format tar --tree-ish $version_cli ../monero-source-${version_cli}.tar && cd .. && bzip2 monero-source-${version_cli}.tar
203- # GUI
204- git clone --recursive -b $version_gui --depth 1 --shallow-submodule https://github.com/monero-project/monero-gui.git monero-gui.git && cd monero-gui.git && ../git-archive-all.sh --prefix monero-gui-source-${version_gui}/ --format tar --tree-ish $version_gui ../monero-gui-source-${version_gui}.tar && cd .. && bzip2 monero-gui-source-${version_gui}.tar
205- mkdir yours
206- cp monero-gui-source-${version_gui}.tar.bz2 yours/.
207- cp monero-source-${version_cli}.tar.bz2 yours/.
208- mkdir from_website
209- echo -e "\n--> Move tarballs from getmonero..."
210- mv ../monero-gui-source-${version_gui}.tar.bz2 from_website/.
211- mv ../monero-source-${version_cli}.tar.bz2 from_website/.
212- echo -e "\n--> Unpacking all..."
213- bunzip2 yours/*.bz2
214- bunzip2 from_website/*.bz2
215- tar xf yours/monero-source-${version_cli}.tar -C yours/
216- tar xf yours/monero-gui-source-${version_gui}.tar -C yours/
217- tar xf from_website/monero-source-${version_cli}.tar -C from_website/
218- tar xf from_website/monero-gui-source-${version_gui}.tar -C from_website
219- # Compare directories
220- echo -e "\n--> Comparing CLI directories"
221- diff -r yours/monero-source-$version_cli from_website/monero-source-$version_cli
222- echo -e "\n--> Comparing GUI directories"
223- diff -r yours/monero-gui-source-$version_gui from_website/monero-gui-source-$version_gui
158+
159+ git clone --recurse-submodules https://github.com/plowsof/monero-torrent.git
160+
161+ # move files for local build of torrent (requires files to be in a folder named cdn)
162+ mkdir monero-torrent/cdn
163+ grep monero- downloads/hashes.txt | awk '{print $2}' | while read -r f; do
164+ mv "$f" monero-torrent/cdn
165+ done
166+ wget https://raw.githubusercontent.com/monero-project/monero/master/utils/gpg_keys/binaryfate.asc
167+ mv binaryfate.asc monero-torrent/cdn
168+ mv downloads/hashes.txt monero-torrent/cdn
169+
170+ # create torrent files
171+ cd monero-torrent
172+ docker compose --profile local up --build
173+
174+ MAGNET_LINK_CLI=$(transmission-show -m /watch/monero-$version_cli.torrent)
175+ MAGNET_LINK_GUI=$(transmission-show -m /watch/monero-gui-$version_gui.torrent)
176+
177+ DL_MAGNET_LINK_CLI=$(yq -r '.cli[0].downloads[] | select(.platform=="Torrent") | .magnet' _data/downloads.yml
178+ DL_MAGNET_LINK_GUI(yq -r '.gui[0].downloads[] | select(.platform=="Torrent") | .magnet' _data/downloads.yml
179+
180+ # confirm docker and .yml agree
181+ [[ "$MAGNET_LINK_CLI" == "$DL_MAGNET_LINK_CLI" ]] || echo "CLI mismatch!"
182+ [[ "$MAGNET_LINK_GUI" == "$DL_MAGNET_LINK_GUI" ]] || echo "GUI mismatch!"
183+
184+ # confirm docker and cdn agree
185+ #CDN_LINK_CLI="https://dlsrc.getmonero.org/monero-$version_cli.torrent"
186+ #CDN_LINK_GUI="https://dlsrc.getmonero.org/monero-gui-$version_gui.torrent"
187+ CDN_LINK_CLI="https://github.com/plowsof/monero-torrent/releases/download/v0.18.4.4/monero-v0.18.4.4.torrent"
188+ CDN_LINK_GUI="https://github.com/plowsof/monero-torrent/releases/download/v0.18.4.4/monero-gui-v0.18.4.4.torrent"
189+
190+ wget $CDN_LINK_CLI
191+ wget $CDN_LINK_CLI
192+
193+ CDN_MAGNET_LINK_CLI=$(transmission-show -m monero-$version_cli.torrent)
194+ CDN_MAGNET_LINK_GUI=$(transmission-show -m monero-gui-$version_gui.torrent)
195+
196+ # confirm docker and .yml agree
197+ [[ "$CDN_MAGNET_LINK_CLI" == "$MAGNET_LINK_CLI" ]] || echo "CLI mismatch!"
198+ [[ "$CDN_MAGNET_LINK_GUI" == "$MAGNET_LINK_GUI" ]] || echo "GUI mismatch!"
0 commit comments