Skip to content

Commit 634d057

Browse files
committed
Swap Bintray URLs with GitHub URLs
Bintray is discontinued as of 1 May 2021.
1 parent a1c6624 commit 634d057

File tree

4 files changed

+8
-18
lines changed

4 files changed

+8
-18
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Vienna 3.0.x requires a minimum of OS X 10.6 (Snow Leopard).
2222
Installing
2323
----------
2424

25-
Admins upload release and test versions at [bintray](https://bintray.com/viennarss/vienna-rss/vienna-rss/) and [Sourceforge](https://sourceforge.net/projects/vienna-rss/files/).
25+
Admins upload release and test versions at [Sourceforge](https://sourceforge.net/projects/vienna-rss/files/).
2626
Alternatively, you can download releases from the [GitHub Releases page](https://github.com/ViennaRSS/vienna-rss/releases).
2727

2828
**Homebrew**

Release Instructions.md

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Instructions for building and uploading Vienna binaries to Github, Sourceforge and Bintray.
1+
Instructions for building and uploading Vienna binaries to Github and Sourceforge.
22

33
## One time setup step: ##
44

@@ -106,15 +106,6 @@ There are two distinct ways to get the different files needed to publish an upda
106106
4. Click the "Publish" button.
107107
5. Verify the uploaded file: download it, uncompress it and check that it runs OK.
108108

109-
### On Bintray.com:
110-
111-
6. Sign in and go to <https://bintray.com/viennarss/vienna-rss/vienna-rss/view>
112-
7. Choose "New version".
113-
8. Fill the name ("3.3.0Beta4"), the description from the version notes, then click "Create version". Add the VCS tag (`v/3.3.0_beta4`) and update.
114-
9. Check the version (at <https://bintray.com/viennarss/vienna-rss/vienna-rss/3.3.0Beta4>), click "Upload files" to go to <https://bintray.com/viennarss/vienna-rss/vienna-rss/3.3.0Beta4/upload> and upload the two .tar.gz files (whose name should be like `Vienna3.3.0_beta4.tar.gz` and `Vienna3.3.0_beta4.5b272a6-dSYM.tar.gz`).
115-
10. Click "Save Changes", then click "Publish".
116-
11. Go back to the files list (<https://bintray.com/viennarss/vienna-rss/vienna-rss/3.3.0Beta4/#files>), select the binary ("Vienna3.3.0_beta4.tar.gz") and choose "Show in download list" in the contextual menu.
117-
118109
### On Sourceforge.net:
119110

120111
12. Check that the SourceForge Downloads page for Vienna at <https://sourceforge.net/projects/vienna-rss/files/> got the new files.

Scripts/Release-for-upload.sh

+5-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
# Directory created during the Changes-and-Notes.sh stage
66
VIENNA_UPLOADS_DIR="${SOURCE_ROOT}/Build/Uploads"
7-
DOWNLOAD_BASE_URL="${BASE_URL_TYP}://${BASE_URL_LOC}"
7+
GITHUB_REPO="https://github.com/ViennaRSS/vienna-rss"
8+
GITHUB_RELEASE_URL="${GITHUB_REPO}/releases/tag/${VCS_TAG}"
9+
GITHUB_ASSETS_URL="${GITHUB_REPO}/releases/download/${VCS_TAG}"
810

911
TGZ_FILENAME="Vienna${N_VCS_TAG}.tar.gz"
1012
dSYM_FILENAME="Vienna${N_VCS_TAG}.${VCS_SHORT_HASH}-dSYM"
@@ -55,9 +57,9 @@ cat > "${VIENNA_CHANGELOG}" << EOF
5557
<item>
5658
<title>Vienna ${V_VCS_TAG} :${VCS_SHORT_HASH}:</title>
5759
<pubDate>${pubDate}</pubDate>
58-
<link>${DOWNLOAD_BASE_URL}/${TGZ_FILENAME}</link>
60+
<link>${GITHUB_RELEASE_URL}</link>
5961
<sparkle:minimumSystemVersion>${MACOSX_DEPLOYMENT_TARGET}.0</sparkle:minimumSystemVersion>
60-
<enclosure url="${DOWNLOAD_BASE_URL}/${TGZ_FILENAME}" sparkle:version="${N_VCS_NUM}" sparkle:shortVersionString="${V_VCS_TAG} :${VCS_SHORT_HASH}:" length="${TGZSIZE}" sparkle:dsaSignature="${SIGNATURE}" type="application/octet-stream"/>
62+
<enclosure url="${GITHUB_ASSETS_URL}/${TGZ_FILENAME}" sparkle:version="${N_VCS_NUM}" sparkle:shortVersionString="${V_VCS_TAG} :${VCS_SHORT_HASH}:" length="${TGZSIZE}" sparkle:dsaSignature="${SIGNATURE}" type="application/octet-stream"/>
6163
<sparkle:releaseNotesLink>https://viennarss.github.io/sparkle-files/noteson${N_VCS_TAG}.html</sparkle:releaseNotesLink>
6264
</item>
6365
</channel>

Vienna.xcodeproj/project.pbxproj

+1-4
Original file line numberDiff line numberDiff line change
@@ -1848,6 +1848,7 @@
18481848
/* Begin PBXShellScriptBuildPhase section */
18491849
3A5482F6168F5C1700887F91 /* Configure Sparkle */ = {
18501850
isa = PBXShellScriptBuildPhase;
1851+
alwaysOutOfDate = 1;
18511852
buildActionMask = 2147483647;
18521853
files = (
18531854
);
@@ -2990,8 +2991,6 @@
29902991
isa = XCBuildConfiguration;
29912992
buildSettings = {
29922993
ALWAYS_SEARCH_USER_PATHS = NO;
2993-
BASE_URL_LOC = "dl.bintray.com/viennarss/vienna-rss";
2994-
BASE_URL_TYP = https;
29952994
CLANG_ANALYZER_GCD_PERFORMANCE = YES;
29962995
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
29972996
CLANG_ENABLE_MODULES = YES;
@@ -3037,8 +3036,6 @@
30373036
isa = XCBuildConfiguration;
30383037
buildSettings = {
30393038
ALWAYS_SEARCH_USER_PATHS = NO;
3040-
BASE_URL_LOC = "dl.bintray.com/viennarss/vienna-rss";
3041-
BASE_URL_TYP = https;
30423039
CLANG_ANALYZER_GCD_PERFORMANCE = YES;
30433040
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
30443041
CLANG_ENABLE_MODULES = YES;

0 commit comments

Comments
 (0)