Skip to content

Commit 678129b

Browse files
authored
fixes some broken/redirected url links (conan-io#704)
* fix broken and redirected links * fix build
1 parent 1f3a705 commit 678129b

File tree

4 files changed

+26
-19
lines changed

4 files changed

+26
-19
lines changed

‎deploy_gh_pages.py‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,31 +70,38 @@ def build_and_copy(branch, folder_name, versions_available, validate_links=False
7070
call("git commit --message 'committed version %s'" % folder_name, ignore_error=True)
7171

7272

73-
def deploy():
73+
def should_deploy():
7474
if not os.getenv("TRAVIS_BRANCH", None) == "master":
7575
print("Skipping deploy for not master branch")
76-
return
76+
return False
7777

7878
if os.getenv("TRAVIS_PULL_REQUEST", "") != "false":
7979
print("Deploy skipped, This is a PR in the main repository")
80-
return
80+
return False
8181

8282
if not os.getenv("GITHUB_API_KEY"):
8383
print("Deploy skipped, missing GITHUB_API_KEY. Is this a PR?")
84-
return
84+
return False
85+
86+
return True
8587

88+
89+
def deploy():
8690
call('git remote add origin-pages '
8791
'https://%s@github.com/conan-io/docs.git > /dev/null 2>&1' % os.getenv("GITHUB_API_KEY"))
8892
call('git push origin-pages gh-pages')
8993

9094

9195
if __name__ == "__main__":
92-
config_git()
93-
clean_gh_pages()
94-
95-
versions_dict = {"master": "1.4",
96-
"release/1.3.3": "1.3"}
97-
for branch, folder_name in versions_dict.items():
98-
build_and_copy(branch, folder_name, versions_dict, validate_links=branch == "master")
99-
100-
deploy()
96+
if should_deploy():
97+
config_git()
98+
clean_gh_pages()
99+
versions_dict = {"master": "1.4",
100+
"release/1.3.3": "1.3"}
101+
for branch, folder_name in versions_dict.items():
102+
build_and_copy(branch, folder_name, versions_dict, validate_links=branch == "master")
103+
104+
deploy()
105+
else:
106+
call("make html")
107+
call("make linkcheck")

‎howtos/generic_ci_artifactory.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ However, you can gather and upload that information using other CI infrastructur
4646
$ rm /tmp/traces.log
4747
4848
5. Edit the `build_info.json` file to append ``name`` (build name), ``number`` (build number) and the ``started`` (started date) and
49-
any other field that you need according to the `Build Info json format <https://github.com/JFrogDev/build-info>`_.
49+
any other field that you need according to the `Build Info json format <https://github.com/jfrog/build-info>`_.
5050

5151
The ``started`` field has to be in the format: ``yyyy-MM-dd'T'HH:mm:ss.SSSZ``
5252

‎reference/conanfile/attributes.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -520,9 +520,9 @@ something like `C:/.conan/tmpdir`. All the folder layout in the conan cache is m
520520
This attribute will not have any effect in other OS, it will be discarded.
521521

522522
From Windows 10 (ver. 10.0.14393), it is possible to opt-in disabling the path limits. Check `this link
523-
<https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx#maxpath>`_ for more info.
524-
Latest python installers might offer to enable this while installing python. With this limit removed, the ``short_paths`` functionality is totally unnecessary.
525-
Please note that this only works with Python 3.6 and newer.
523+
<https://docs.microsoft.com/es-es/windows/desktop/FileIO/naming-a-file#maximum-path-length-limitation>`_ for more info.
524+
Latest python installers might offer to enable this while installing python. With this limit removed, the ``short_paths`` functionality is
525+
totally unnecessary. Please note that this only works with Python 3.6 and newer.
526526

527527
.. _no_copy_source:
528528

‎uploading_packages/using_bintray.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ On an OSS account, all packages you upload are public, and anyone can use them b
88
repository to their Conan remotes.
99

1010
To allow collaboration on open source projects, you can also create
11-
`Organizations <https://bintray.com/docs/usermanual/interacting/interacting_bintrayorganizations.html>`_
12-
in Bintray and add members who will be able to create and edit packages in your organizations
11+
`Organizations <https://www.jfrog.com/confluence/display/BT/Bintray+Organizations>`_
12+
in Bintray and add members who will be able to create and edit packages in your organization's
1313
repositories.
1414

1515
.. toctree::

0 commit comments

Comments
 (0)