Skip to content

Commit

Permalink
Merge remote-tracking branch 'mixxxdj/2.5' into 2.5-rel
Browse files Browse the repository at this point in the history
  • Loading branch information
daschuer committed Oct 4, 2023
2 parents dacaacf + 46ec071 commit 62ca59f
Show file tree
Hide file tree
Showing 2,241 changed files with 22,222 additions and 10,851 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,7 @@ jobs:
- uses: actions/stale@v6
with:
stale-issue-message: 'This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 28 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment.'
only-labels: 'category:question'
days-before-issue-stale: 28
days-before-pr-stale: -1
days-before-close: 14
- uses: actions/stale@v6
with:
stale-issue-message: 'This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 28 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment.'
only-labels: 'requires:repro'
any-of-labels: 'category:question,requires:repro,requires:more-information'
days-before-issue-stale: 28
days-before-pr-stale: -1
days-before-close: 14
Expand All @@ -29,3 +22,10 @@ jobs:
days-before-issue-stale: 60
days-before-pr-stale: -1
days-before-close: 14
- uses: actions/stale@v6
with:
stale-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 180 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment."
exempt-issue-labels: 'no-stale,category:new-port,category:question,requires:repro,requires:more-information'
days-before-issue-stale: 180
days-before-pr-stale: -1
days-before-close: 14
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
[Español](README_es.md)
[한국어](README_ko_KR.md)
[Français](README_fr.md)
[Tiếng Việt](README_vn.md)

Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS.
This tool and ecosystem are constantly evolving, and we always appreciate contributions!
Expand Down Expand Up @@ -32,7 +33,7 @@ you can run `vcpkg help`, or `vcpkg help [command]` for command-specific help.
- [Visual Studio Code with CMake Tools](#visual-studio-code-with-cmake-tools)
- [Vcpkg with Visual Studio CMake Projects](#vcpkg-with-visual-studio-cmake-projects)
- [Vcpkg with CLion](#vcpkg-with-clion)
- [Vcpkg as a Submodule](#vcpkg-as-a-submodule)
- [Vcpkg as a Submodule](#vcpkg-as-a-submodule-with-cmake)
- [Tab-Completion/Auto-Completion](#tab-completionauto-completion)
- [Examples](#examples)
- [Contributing](#contributing)
Expand Down Expand Up @@ -320,7 +321,7 @@ places the associated license(s) in the location `installed/<triplet>/share/<por
Most ports in vcpkg build the libraries in question using the original build system preferred
by the original developers of those libraries, and download source code and build tools from their
official distribution locations. For use behind a firewall, the specific access needed will depend
on which ports are being installed. If you must install in in an "air gapped" environment, consider
on which ports are being installed. If you must install it in an "air gapped" environment, consider
installing once in a non-"air gapped" environment, populating an
[asset cache](https://learn.microsoft.com/vcpkg/users/assetcaching) shared with the otherwise "air gapped" environment.

Expand Down
15 changes: 8 additions & 7 deletions README_es.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,12 @@ Prerrequisitos:
- [Git][getting-started:git]
- [Visual Studio][getting-started:visual-studio] 2015 Update 3 o superior con el paquete Inglés de Visual Studio.

Primero, descargue y compile vcpkg; puede ser instalado en cualquier lugar,
pero generalmente recomendamos usar vcpkg como submódulo para proyectos de CMake,
e instalándolo globalmente para Proyectos de Visual Studio.
recomendamos un lugar como `C:\src\vcpkg` o `C:\dev\vcpkg`,
ya que de otra forma puede encontrarse problemas de ruta para algunos sistemas de port.
Primero, descargue y compile vcpkg; puede ser instalado en cualquier lugar, pero por lo general recomendamos usar vcpkg
como submódulo, asi el repositorio que lo consume puede permanecer autónomo.
Alternativamente vcpkg puede ser instalado globalmente;
recomendamos que sea en un lugar como `C:\src\vcpkg` o `C:\dev\vcpkg`,

ya que de otra forma puede encontrarse problemas de ruta para algunos sistemas de port.

```cmd
> git clone https://github.com/microsoft/vcpkg
Expand Down Expand Up @@ -130,8 +131,8 @@ Prerrequisitos para macOS:

- [Herramientas de desarrollo de Apple][getting-started:macos-dev-tools]

Primero, descargue y compile vcpkg, puede ser instalado donde sea,
pero recomendamos usar vcpkg como submodulo para proyectos de CMake.
Primero, descargue y compile vcpkg, puede ser instalado donde lo desee,
pero recomendamos usar vcpkg como un submodulo.

```sh
$ git clone https://github.com/microsoft/vcpkg
Expand Down
Loading

0 comments on commit 62ca59f

Please sign in to comment.