Skip to content

Commit 16e1259

Browse files
rressi-at-globusrressi-at-globus
committed
Merge branch 'main' into binary_caching_preserve_zips_from_cloud_storage
2 parents 676e48f + 145689e commit 16e1259

File tree

101 files changed

+4076
-1466
lines changed

Some content is hidden

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

101 files changed

+4076
-1466
lines changed

‎azure-pipelines/e2e-assets/ci-feature-baseline/bad-options.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
vcpkg-empty-featureful-port[a,b] = options
2+
vcpkg-empty-featureful-port[a-default-feature,b] = options
3+
vcpkg-empty-featureful-port[b] = options
4+
vcpkg-empty-featureful-port[c,b] = options

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
vcpkg-empty-featureful-port[a,b] = feature-fails
2-
vcpkg-empty-featureful-port[b,c] = cascade
1+
vcpkg-empty-featureful-port[a,b] = feature-fails
2+
vcpkg-empty-featureful-port[b,c] = cascade

‎azure-pipelines/e2e-assets/ci-feature-baseline/conflicting-states.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
vcpkg-empty-featureful-port = pass
2+
vcpkg-empty-featureful-port = cascade

‎azure-pipelines/e2e-assets/ci-feature-baseline/unexpected-cascade-combination-fail.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
vcpkg-depends-on-fail-core[core,x]=combination-fails

‎azure-pipelines/e2e-assets/ci-feature-baseline/unexpected-cascade-feature-fail.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
vcpkg-depends-on-fail-feature[x]=feature-fails

‎azure-pipelines/e2e-assets/ci-feature-baseline/unexpected-cascade-port-fail.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
vcpkg-depends-on-fail-core=fail

‎azure-pipelines/e2e-assets/ci-feature-baseline/unexpected-pass-combo-fail.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# This is a comment to get the line to be 2
2+
vcpkg-empty-featureful-port[a,a-default-feature,b,c] = combination-fails

‎azure-pipelines/e2e-assets/ci-feature-baseline/unexpected-pass-everything.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
vcpkg-empty-featureful-port[c] = combination-fails
2+
vcpkg-empty-featureful-port[a] = cascade
3+
vcpkg-empty-featureful-port[b] = feature-fails
4+
vcpkg-empty-featureful-port[default-feature] = feature-fails
5+
vcpkg-empty-featureful-port = fail
6+
vcpkg-empty-featureful-port[core,a-default-feature,c] = combination-fails

‎azure-pipelines/e2e-assets/ci-feature-baseline/unexpected-pass-feature-cascade.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# This is a comment to get the line to be 2
2+
vcpkg-empty-featureful-port[a] = cascade

‎azure-pipelines/e2e-assets/ci-feature-baseline/unexpected-pass-feature-fail.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# This is a comment to get the line to be 2
2+
vcpkg-empty-featureful-port[b] = feature-fails

0 commit comments

Comments
 (0)