Skip to content
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
3 changes: 3 additions & 0 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,9 @@

# A list of regular expressions that match URIs that should not be checked when doing a linkcheck build.
linkcheck_ignore = [r'http://localhost:\d+']
linkcheck_workers = 30
linkcheck_timeout = 90
linkcheck_retries = 2


# copy legacy redirects
Expand Down
4 changes: 2 additions & 2 deletions howtos/generic_ci_artifactory.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Uploading the BuildInfo
-----------------------

If you are using :ref:`Jenkins with Conan and Artifactory<jenkins_integration>`, along with the
`Jenkins Artifactory Plugin <https://www.jfrog.com/confluence/display/RTF/Jenkins+Artifactory+Plug-in>`_,
`Jenkins Artifactory Plugin <https://www.jfrog.com/confluence/display/JFROG/Jenkins+Artifactory+Plug-in>`_,
any Conan package downloaded or uploaded during your build will be automatically recorded in
the BuildInfo json file, that will be automatically uploaded to the specified Artifactory instance.

Expand All @@ -18,7 +18,7 @@ Extracting build-info from the Conan trace log
##############################################

1. Before calling Conan the first time in your build, set the environment variable `CONAN_TRACE_FILE` to a
file path. The generated file will contain the `BuildInfo json <https://www.jfrog.com/confluence/display/RTF/Build+Integration#BuildIntegration-BuildInfoJSON>`_.
file path. The generated file will contain the `BuildInfo json <https://www.jfrog.com/confluence/display/JFROG/Build+Integration#BuildIntegration-BuildInfoJSON>`_.

2. You also need to create the :ref:`artifacts.properties<artifacts.properties>` file in your Conan home containing the build
information. All this properties will be automatically associated to all the published artifacts.
Expand Down
6 changes: 3 additions & 3 deletions integrations/ci/jenkins.rst
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,6 @@ and then upload it to Artifactory. We also upload the `build information`_:
.. |jenkins_stages_creator| image:: ../../images/conan-jenkins_stages_creator.png
.. _`Artifactory`: https://jfrog.com/artifactory/
.. _`Jenkins Artifactory Plugin`:
.. _`here how to install the plugin`: https://www.jfrog.com/confluence/display/RTF/Jenkins+Artifactory+Plug-in
.. _`here you can check the full documentation about the DSL`: https://www.jfrog.com/confluence/display/RTF/Working+With+Pipeline+Jobs+in+Jenkins
.. _`build information`: https://www.jfrog.com/confluence/display/RTF/Build+Integration
.. _`here how to install the plugin`: https://www.jfrog.com/confluence/display/JFROG/Jenkins+Artifactory+Plug-in
.. _`here you can check the full documentation about the DSL`: https://www.jfrog.com/confluence/display/JFROG/Working+With+Pipeline+Jobs+in+Jenkins
.. _`build information`: https://www.jfrog.com/confluence/display/JFROG/Build+Integration
4 changes: 2 additions & 2 deletions uploading_packages/remotes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ For private development:
- **Artifactory Pro**: Artifactory is the binary repository manager for all major packaging formats. It
is the recommended remote type for enterprise and professional package management. Check the
`Artifactory documentation`_ for more information. For a comparison between Artifactory editions,
check the `Artifactory Comparison Matrix <https://www.jfrog.com/confluence/display/RTF/Artifactory+Comparison+Matrix>`_.
check the `Artifactory Comparison Matrix <https://www.jfrog.com/confluence/display/JFROG/Artifactory+Comparison+Matrix>`_.
- **Conan server**: Simple, free and open source, MIT licensed server that comes bundled with the Conan client.
Check :ref:`running_your_server` for more information.

Expand Down Expand Up @@ -105,4 +105,4 @@ Conan Community


.. _`conan-center`: https://bintray.com/conan/conan-center
.. _Artifactory documentation: https://www.jfrog.com/confluence/display/RTF/Welcome+to+Artifactory
.. _Artifactory documentation: https://www.jfrog.com/confluence/display/JFROG/JFrog+Artifactory