Skip to content

Commit a79536b

Browse files
committed
CI: add torrent url to env for rss feed
fix infohash
1 parent 7be0407 commit a79536b

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

.github/workflows/build-docker.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,16 @@ jobs:
105105
MAGNET_LINK_GUI=$(docker run --rm -v "./watch:/watch" ghcr.io/plowsof/monero-torrent-show:latest -m /watch/monero-gui-$VERSION_GUI.torrent)
106106
echo "MAGNET_LINK_LOCAL=$MAGNET_LINK" >> $GITHUB_ENV
107107
echo "MAGNET_LINK_LOCAL_GUI=$MAGNET_LINK_GUI" >> $GITHUB_ENV
108+
INFOHASH="${MAGNET_LINK#*btih:}"
109+
INFOHASH="${INFOHASH%%&*}"
110+
INFOHASH_GUI="${MAGNET_LINK_GUI#*btih:}"
111+
INFOHASH_GUI="${INFOHASH_GUI%%&*}"
112+
TORRENT_URL="https://github.com/plowsof/monero-torrent/releases/download/${GITHUB_REF_NAME}/monero-${VERSION}.torrent"
113+
TORRENT_URL_GUI="https://github.com/plowsof/monero-torrent/releases/download/${GITHUB_REF_NAME}/monero-gui-${VERSION_GUI}.torrent"
114+
echo "INFOHASH=$INFOHASH" >> $GITHUB_ENV
115+
echo "INFOHASH_GUI=$INFOHASH_GUI" >> $GITHUB_ENV
116+
echo "TORRENT_URL=$TORRENT_URL" >> $GITHUB_ENV
117+
echo "TORRENT_URL_GUI=$TORRENT_URL_GUI" >> $GITHUB_ENV
108118
109119
- name: Push new image to ghcr
110120
if: github.ref_type == 'tag' || ( steps.changes.outputs.src == 'true' && github.ref == 'refs/heads/main' )
@@ -166,14 +176,6 @@ jobs:
166176
git fetch origin "${GITHUB_REF_NAME}"
167177
git checkout "${GITHUB_REF_NAME}"
168178
git checkout -b update-rss-${VERSION}
169-
INFOHASH="${MAGNET_LINK_LOCAL#*btih:}"
170-
INFOHASH="${INFOHASH%%&*}"
171-
INFOHASH_GUI="${MAGNET_LINK_LOCAL_GUI#*btih:}"
172-
INFOHASH_GUI="${INFOHASH_GUI%%&*}"
173-
TORRENT_URL="https://github.com/plowsof/monero-torrent/releases/download/${GITHUB_REF_NAME}/monero-${VERSION}.torrent"
174-
TORRENT_URL_GUI="https://github.com/plowsof/monero-torrent/releases/download/${GITHUB_REF_NAME}/monero-gui-${VERSION_GUI}.torrent"
175-
echo "TORRENT_URL=$TORRENT_URL" >> $GITHUB_ENV
176-
echo "TORRENT_URL_GUI=$TORRENT_URL_GUI" >> $GITHUB_ENV
177179
./rss/add_to_rss.sh
178180
git add ./rss/torrent-rss.xml
179181
git commit -m "RSS: add $VERSION"

rss/add_to_rss.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MAGNET_LINK="${MAGNET_LINK//&/&}"
1010
MAGNET_LINK_GUI="${MAGNET_LINK_LOCAL_GUI:-magnet:?xt=test123&123}"
1111
MAGNET_LINK_GUI="${MAGNET_LINK_GUI//&/&}"
1212
VERSION="${VERSION:-v0.18.0.0}"
13-
VERSION_GUI="${VERSION:-v0.18.0.1}"
13+
VERSION_GUI="${VERSION_GUI:-v0.18.0.1}"
1414
TITLE="Monero $VERSION"
1515
TITLE_GUI="Monero GUI $VERSION_GUI"
1616
PUBDATE="$(date -R)"

0 commit comments

Comments
 (0)