Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into license-report-wip
Browse files Browse the repository at this point in the history
# Conflicts:
#	include/vcpkg/base/contractual-constants.h
#	include/vcpkg/spdx.h
#	include/vcpkg/vcpkglib.h
#	src/vcpkg/commands.build.cpp
#	src/vcpkg/commands.ci.cpp
#	src/vcpkg/commands.install.cpp
#	src/vcpkg/commands.set-installed.cpp
#	src/vcpkg/commands.upgrade.cpp
#	src/vcpkg/spdx.cpp
#	src/vcpkg/vcpkglib.cpp
  • Loading branch information
BillyONeal committed Feb 26, 2025
2 parents 56ed607 + bec4296 commit d1374c5
Show file tree
Hide file tree
Showing 188 changed files with 15,475 additions and 5,850 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
runs-on: ${{ matrix.os }}
timeout-minutes: 120
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "18.x"
cache: 'npm'
cache-dependency-path: vcpkg-artifacts/package-lock.json
- uses: lukka/get-cmake@v3.26.3
- uses: lukka/get-cmake@v3.31.0
with:
cmakeVersion: 3.22.1 # ubuntu 22.04
ninjaVersion: 1.11.1
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
run: |
"VCPKG_SHA="+(Get-Content vcpkg-init/vcpkg-scripts-sha.txt -Raw).Trim() >> $env:GITHUB_OUTPUT
- name: Checkout microsoft/vcpkg for end-to-end tests
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
path: ${{ github.workspace }}/vcpkg-root
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ jobs:
runs-on: windows-2022
timeout-minutes: 60
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "18.x"
cache: 'npm'
cache-dependency-path: vcpkg-artifacts/package-lock.json
- uses: lukka/get-cmake@v3.26.3
- uses: lukka/get-cmake@v3.31.0
with:
cmakeVersion: 3.22.1 # ubuntu 22.04
ninjaVersion: 1.11.1
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
exit 1
}
- name: 'Publish Format and Messages File Diff'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure() && steps.diff.outcome == 'failure'
with:
name: format.patch
Expand All @@ -75,14 +75,14 @@ jobs:
runs-on: windows-2022
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get microsoft/vcpkg pinned sha into VCPKG_SHA
id: vcpkg_sha
shell: pwsh
run: |
"VCPKG_SHA="+(Get-Content vcpkg-init/vcpkg-scripts-sha.txt -Raw).Trim() >> $env:GITHUB_OUTPUT
- name: Checkout microsoft/vcpkg for end-to-end tests
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
path: ${{ github.workspace }}/vcpkg-root
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Vcpkg: Overview

[中文总览](https://github.com/microsoft/vcpkg/blob/master/README_zh_CN.md)
[Español](https://github.com/microsoft/vcpkg/blob/master/README_es.md)
[한국어](https://github.com/microsoft/vcpkg/blob/master/README_ko_KR.md)
[Français](https://github.com/microsoft/vcpkg/blob/master/README_fr.md)
[中文总览](https://learn.microsoft.com/zh-cn/vcpkg/get_started/overview)
[Español](https://learn.microsoft.com/es/vcpkg/get_started/overview)
[한국어](https://learn.microsoft.com/ko-kr/vcpkg/get_started/overview)
[Français](https://learn.microsoft.com/fr/vcpkg/get_started/overview)

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
3 changes: 3 additions & 0 deletions azure-pipelines/e2e-assets/asset-caching/bad-hash-script.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Param([string]$File)
Write-Host "Creating file with the wrong hash"
Set-Content -Path $File -Value "This is a file with the wrong hash" -Encoding Ascii -NoNewline
2 changes: 2 additions & 0 deletions azure-pipelines/e2e-assets/asset-caching/failing-script.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Write-Host "Script download error"
exit 1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Write-Host "Not creating a file"
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"name": "broken-duplicate-overrides",
"version": "1",
"dependencies": [
"zlib"
],
"overrides": [
{
"name": "zlib",
"version": "1.2.13"
},
{
"name": "zlib",
"version": "1.3.1"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
vcpkg_download_distfile(
SOURCE_PATH
URLS https://example.com/hello-world.txt
# This must stay uppercase to check that the SHA512 is properly tolower'd when it gets passed to x-script
SHA512 09E1E2A84C92B56C8280F4A1203C7CFFD61B162CFE987278D4D6BE9AFBF38C0E8934CDADF83751F4E99D111352BFFEFC958E5A4852C8A7A29C95742CE59288A8
FILENAME hello-world.txt
)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"overlay-ports": [ "." ]
}
5 changes: 5 additions & 0 deletions azure-pipelines/e2e-projects/overlays-dot/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"dependencies": [
"a"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# This port is intentionally malformed and should not be loaded, because ../../a should be loaded instead
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "a",
"version": "0",
"intentionally-malformed"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "a",
"version": "0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"$comment": "'config-overlays/a' in . should get loaded first, so we should never consider 'builtin-malformed/a'",
"overlay-ports": [ "config-overlays" ]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"dependencies": [
"a"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "a",
"version": "0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# This port is intentionally malformed and should not be loaded, because ../../a should be loaded instead
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "a",
"version": "0",
"intentionally-malformed"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"$comment": "'config-overlays/a' in . should get loaded first, so we should never consider 'config-overlays/malformed/a'",
"overlay-ports": [ "config-overlays", "config-overlays/malformed" ]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"dependencies": [
"a"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This file exists only to ensure that git creates the directory containing it, so that ./hello/.. is a valid path.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"overlay-ports": [ "./hello/.." ]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"dependencies": [
"a"
]
}
Loading

0 comments on commit d1374c5

Please sign in to comment.