Skip to content

Commit 391f238

Browse files
BillyONealBillyONeal
committed
Merge remote-tracking branch 'origin/main' into fetch-audit
# Conflicts: # include/vcpkg/base/json.h # src/vcpkg/binarycaching.cpp # src/vcpkg/commands.ci.cpp
2 parents a86d542 + 6db7cae commit 391f238

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1751
-1048
lines changed

‎azure-pipelines/e2e-assets/ci-skipped-features/baseline.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
skipped-depends:arm64-osx=skip
2+
skipped-depends:x64-linux=skip
3+
skipped-depends:x64-osx=skip
4+
skipped-depends:x64-windows=skip
5+
skipped-depends:x86-windows=skip

‎azure-pipelines/e2e-assets/ci-skipped-features/skipped-depends/portfile.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
message(FATAL_ERROR "This port is skipped and should not be attempted.")

‎azure-pipelines/e2e-assets/ci-skipped-features/skipped-depends/vcpkg.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"name": "skipped-depends",
3+
"version": "1.0.0",
4+
"dependencies": [
5+
{
6+
"name": "skipped-features",
7+
"default-features": false,
8+
"features": [
9+
"fail-if-included"
10+
]
11+
}
12+
]
13+
}

‎azure-pipelines/e2e-assets/ci-skipped-features/skipped-features/portfile.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
2+
if ("fail-if-included" IN_LIST FEATURES)
3+
message(FATAL_ERROR "The feature 'fail-if-included' should not be included.")
4+
endif()

‎azure-pipelines/e2e-assets/ci-skipped-features/skipped-features/vcpkg.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"name": "skipped-features",
3+
"version": "1.0.0",
4+
"features": {
5+
"fail-if-included": {
6+
"description": "This feature should cause a failure if it is included in the build."
7+
}
8+
}
9+
}

‎azure-pipelines/e2e-assets/ci-skipped-ports/always-built/portfile.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

‎azure-pipelines/e2e-assets/ci-skipped-ports/always-built/vcpkg.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "always-built",
3+
"version": "1.0.0"
4+
}

‎azure-pipelines/e2e-assets/ci-skipped-ports/always-cascade/portfile.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
message(FATAL_ERROR "This port should always cascade and should not be attempted.")

‎azure-pipelines/e2e-assets/ci-skipped-ports/always-cascade/vcpkg.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"name": "always-cascade",
3+
"version": "1.0.0",
4+
"dependencies": [
5+
"always-skip"
6+
]
7+
}

‎azure-pipelines/e2e-assets/ci-skipped-ports/always-skip/portfile.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
message(FATAL_ERROR "This port should always be skipped by baseline.txt and should not be attempted.")

0 commit comments

Comments
 (0)