Skip to content
Draft
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
4 changes: 4 additions & 0 deletions .gitmodules
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
# generated by zed-pkg-test/test-org-fleet; edit the fleet manifest or bootstrapper, not this file.
# disposable DEN-2877 canary: this branch and PR must never be merged.
[submodule "vendor/zed-clients"]
path = vendor/zed-clients
url = https://github.com/zed-pkg/zed-clients.git

[submodule "vendor/java-lib"]
path = vendor/java-lib
url = https://github.com/zed-pkg-test/java-lib.git
2 changes: 2 additions & 0 deletions .zpkg.toml
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
# generated by zed-pkg-test/test-org-fleet; edit the fleet manifest or bootstrapper, not this file.
# disposable DEN-2877 canary: this branch and PR must never be merged.
[package]
org = "zed-pkg-test"
name = "java-app"
Expand All@@ -15,3 +16,4 @@ dir = ".vendor/.zed"

[dependencies]
"zed-pkg/zed-clients" = "^0.1.0"
"zed-pkg-test/java-lib" = "^0.1.1"
16 changes: 16 additions & 0 deletions canary/nightly-reconciliation-dependent.json
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
{
"schema_version": "nightly-reconciliation-canary.v1",
"linear_issue": "DEN-2877",
"source_policy_pr": "ORESoftware/project-registry#44",
"scenario": "dependent-pr-references-open-dependency-pr-through-zed-and-gitlink",
"repository": "zed-pkg-test/java-app",
"base_sha": "59ea6f7473edfc6e8675fc7c2f7d7b0589611060",
"dependency_repository": "zed-pkg-test/java-lib",
"dependency_pull_request": 2,
"dependency_head_sha": "c9fa3cb0b50bb39dc3cff005ef3640ae05d9ebfd",
"zed_requirement": "^0.1.1",
"gitlink_path": "vendor/java-lib",
"disposable": true,
"merge_forbidden": true,
"purpose": "Prove that the nightly reconciler discovers and re-evaluates a dependent PR when an open dependency PR changes, using both Zed metadata and an exact git submodule edge."
}
9 changes: 8 additions & 1 deletion source-pins.json
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
"generatedBy": "generated by zed-pkg-test/test-org-fleet",
"generatedBy": "generated by zed-pkg-test/test-org-fleet; disposable DEN-2877 canary",
"sources": {
"zed-pkg/zed-cli": {
"branch": "main",
Expand All@@ -10,6 +10,13 @@
"branch": "main",
"sha": "c97ead9ce1cd3675be7704d35e2395fa59f4baa4",
"exists": true
},
"zed-pkg-test/java-lib": {
"branch": "canary/den-2877-java-lib-dependency",
"sha": "c9fa3cb0b50bb39dc3cff005ef3640ae05d9ebfd",
"exists": true,
"pullRequest": 2,
"mergeForbidden": true
}
}
}
27 changes: 25 additions & 2 deletions test-plan.json
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
{
"generatedBy": "generated by zed-pkg-test/test-org-fleet",
"generatedBy": "generated by zed-pkg-test/test-org-fleet; disposable DEN-2877 canary",
"schemaVersion": 1,
"sourceOrganization": "zed-pkg",
"testOrganization": "zed-pkg-test",
Expand All@@ -9,7 +9,8 @@
"focus": [
"consumer install",
"classpath wiring",
"offline frozen restore"
"offline frozen restore",
"nightly dependent reconciliation through Zed and gitlinks"
],
"services": [],
"matrix": {},
Expand All@@ -34,6 +35,13 @@
"branch": "main",
"sha": "c97ead9ce1cd3675be7704d35e2395fa59f4baa4",
"visibility": "public"
},
{
"fullName": "zed-pkg-test/java-lib",
"exists": true,
"branch": "canary/den-2877-java-lib-dependency",
"sha": "c9fa3cb0b50bb39dc3cff005ef3640ae05d9ebfd",
"visibility": "public"
}
],
"sourceGates": [],
Expand All@@ -51,12 +59,27 @@
"source": "zed-pkg/zed-clients",
"mode": "native-package",
"manager": "maven"
},
{
"source": "zed-pkg-test/java-lib",
"mode": "git-submodule",
"path": "vendor/java-lib"
},
{
"source": "zed-pkg-test/java-lib",
"mode": "zed"
}
],
"security": {
"immutableSourcePins": true,
"pullRequestCredentials": false,
"leastPrivilege": true,
"redactSecretsAndRawMedia": true
},
"canary": {
"linearIssue": "DEN-2877",
"dependencyPullRequest": "zed-pkg-test/java-lib#2",
"mergeForbidden": true,
"disposable": true
}
}
1 change: 1 addition & 0 deletions vendor/java-lib
Submodule java-lib added at c9fa3c