Merge pull request #2833 from ibuclaw/merge_stable

merge stable
dlang · Jan 28, 2024 · fa26ee3 · fa26ee3
2 parents ef0bf93 + d88326d
commit fa26ee3
Show file tree

Hide file tree

Showing 34 changed files with 12 additions and 27 deletions.
diff --git a/source/dub/packagemanager.d b/source/dub/packagemanager.d
@@ -1446,7 +1446,7 @@ package struct Location {
 
 			// Managed structure: $ROOT/$NAME/$VERSION/$NAME
 			// This is the most common code path
-			else if (mgr.isManagedPath(path)) {
+			else {
 				// Iterate over versions of a package
 				foreach (versdir; mgr.iterateDirectory(pack_path)) {
 					if (!versdir.isDirectory) continue;

diff --git a/source/dub/version_.d b/source/dub/version_.d
@@ -1,2 +1,2 @@
 module dub.version_;
-enum dubVersion = "v1.36.0-beta.1";
+enum dubVersion = "v1.36.0-rc.1";
diff --git a/...ue1005-configuration-resolution/a/dub.sdl → ...onfiguration-resolution/a/1.0.0/a/dub.sdl b/...ue1005-configuration-resolution/a/dub.sdl → ...onfiguration-resolution/a/1.0.0/a/dub.sdl
diff --git a/...ue1005-configuration-resolution/b/dub.sdl → ...onfiguration-resolution/b/1.0.0/b/dub.sdl b/...ue1005-configuration-resolution/b/dub.sdl → ...onfiguration-resolution/b/1.0.0/b/dub.sdl
diff --git a/...005-configuration-resolution/b/source/b.d → ...iguration-resolution/b/1.0.0/b/source/b.d b/...005-configuration-resolution/b/source/b.d → ...iguration-resolution/b/1.0.0/b/source/b.d
diff --git a/...ue1005-configuration-resolution/c/dub.sdl → ...onfiguration-resolution/c/1.0.0/c/dub.sdl b/...ue1005-configuration-resolution/c/dub.sdl → ...onfiguration-resolution/c/1.0.0/c/dub.sdl
diff --git a/...005-configuration-resolution/main/dub.sdl → ...tion-resolution/main/~master/main/dub.sdl b/...005-configuration-resolution/main/dub.sdl → ...tion-resolution/main/~master/main/dub.sdl
diff --git a/...onfiguration-resolution/main/source/app.d → ...resolution/main/~master/main/source/app.d b/...onfiguration-resolution/main/source/app.d → ...resolution/main/~master/main/source/app.d
diff --git a/test/issue1024-selective-upgrade.sh b/test/issue1024-selective-upgrade.sh
@@ -2,13 +2,13 @@
 
 . $(dirname "${BASH_SOURCE[0]}")/common.sh
 cd ${CURR_DIR}/issue1024-selective-upgrade
-echo "{\"fileVersion\": 1,\"versions\": {\"a\": \"1.0.0\", \"b\": \"1.0.0\"}}" > main/dub.selections.json
-$DUB upgrade --bare --root=main a
+echo "{\"fileVersion\": 1,\"versions\": {\"a\": \"1.0.0\", \"b\": \"1.0.0\"}}" > main/~master/main/dub.selections.json
+$DUB upgrade --bare --root=main/~master/main/ a
 
-if ! grep -c -e "\"a\": \"1.0.1\"" main/dub.selections.json; then
+if ! grep -c -e "\"a\": \"1.0.1\"" main/~master/main/dub.selections.json; then
 	die $LINENO "Specified dependency was not upgraded."
 fi
 
-if grep -c -e "\"b\": \"1.0.1\"" main/dub.selections.json; then
+if grep -c -e "\"b\": \"1.0.1\"" main/~master/main/dub.selections.json; then
 	die $LINENO "Non-specified dependency got upgraded."
 fi
diff --git a/...sue1024-selective-upgrade/a-1.0.0/dub.sdl → ...e1024-selective-upgrade/a/1.0.0/a/dub.sdl b/...sue1024-selective-upgrade/a-1.0.0/dub.sdl → ...e1024-selective-upgrade/a/1.0.0/a/dub.sdl
diff --git a/...sue1024-selective-upgrade/a-1.0.1/dub.sdl → ...e1024-selective-upgrade/a/1.0.1/a/dub.sdl b/...sue1024-selective-upgrade/a-1.0.1/dub.sdl → ...e1024-selective-upgrade/a/1.0.1/a/dub.sdl
diff --git a/...sue1024-selective-upgrade/b-1.0.0/dub.sdl → ...e1024-selective-upgrade/b/1.0.0/b/dub.sdl b/...sue1024-selective-upgrade/b-1.0.0/dub.sdl → ...e1024-selective-upgrade/b/1.0.0/b/dub.sdl
diff --git a/...sue1024-selective-upgrade/b-1.0.1/dub.sdl → ...e1024-selective-upgrade/b/1.0.1/b/dub.sdl b/...sue1024-selective-upgrade/b-1.0.1/dub.sdl → ...e1024-selective-upgrade/b/1.0.1/b/dub.sdl
diff --git a/.../issue1024-selective-upgrade/main/dub.sdl → ...lective-upgrade/main/~master/main/dub.sdl b/.../issue1024-selective-upgrade/main/dub.sdl → ...lective-upgrade/main/~master/main/dub.sdl
diff --git a/test/issue564-invalid-upgrade-dependency.sh b/test/issue564-invalid-upgrade-dependency.sh
@@ -2,7 +2,4 @@
 
 . $(dirname "${BASH_SOURCE[0]}")/common.sh
 cd ${CURR_DIR}/issue564-invalid-upgrade-dependency
-rm -rf a-1.0.0/.dub
-rm -rf a-1.1.0/.dub
-rm -rf main/.dub
-${DUB} build --bare --compiler=${DC} main
+${DUB} build -f --bare --compiler=${DC} main
diff --git a/...valid-upgrade-dependency/a-1.0.0/dub.json → ...lid-upgrade-dependency/a/1.0.0/a/dub.json b/...valid-upgrade-dependency/a-1.0.0/dub.json → ...lid-upgrade-dependency/a/1.0.0/a/dub.json
diff --git a/...lid-upgrade-dependency/a-1.0.0/source/a.d → ...d-upgrade-dependency/a/1.0.0/a/source/a.d b/...lid-upgrade-dependency/a-1.0.0/source/a.d → ...d-upgrade-dependency/a/1.0.0/a/source/a.d
diff --git a/...valid-upgrade-dependency/a-1.1.0/dub.json → ...lid-upgrade-dependency/a/1.1.0/a/dub.json b/...valid-upgrade-dependency/a-1.1.0/dub.json → ...lid-upgrade-dependency/a/1.1.0/a/dub.json
diff --git a/...lid-upgrade-dependency/a-1.1.0/source/a.d → ...d-upgrade-dependency/a/1.1.0/a/source/a.d b/...lid-upgrade-dependency/a-1.1.0/source/a.d → ...d-upgrade-dependency/a/1.1.0/a/source/a.d
diff --git a/test/issue564-invalid-upgrade-dependency/main/dub.selections.json b/test/issue564-invalid-upgrade-dependency/main/dub.selections.json
diff --git a/...-invalid-upgrade-dependency/main/dub.json → ...ade-dependency/main/~master/main/dub.json b/...-invalid-upgrade-dependency/main/dub.json → ...ade-dependency/main/~master/main/dub.json
diff --git a/...alid-upgrade-dependency/main/source/app.d → ...dependency/main/~master/main/source/app.d b/...alid-upgrade-dependency/main/source/app.d → ...dependency/main/~master/main/source/app.d
diff --git a/test/issue813-pure-sub-dependency.sh b/test/issue813-pure-sub-dependency.sh
@@ -2,8 +2,5 @@
 
 . $(dirname "${BASH_SOURCE[0]}")/common.sh
 cd ${CURR_DIR}/issue813-pure-sub-dependency
-rm -rf main/.dub
-rm -rf sub/.dub
-rm -rf sub/sub/.dub
-rm -f main/dub.selections.json
-${DUB} build --bare --compiler=${DC} main
+rm -f main/~master/main/dub.selections.json
+${DUB} build -f --bare --compiler=${DC} main
diff --git a/...issue813-pure-sub-dependency/main/dub.sdl → ...-sub-dependency/main/~master/main/dub.sdl b/...issue813-pure-sub-dependency/main/dub.sdl → ...-sub-dependency/main/~master/main/dub.sdl
diff --git a/...sue813-pure-sub-dependency/main/src/app.d → ...ub-dependency/main/~master/main/src/app.d b/...sue813-pure-sub-dependency/main/src/app.d → ...ub-dependency/main/~master/main/src/app.d
diff --git a/.../issue813-pure-sub-dependency/sub/dub.sdl → ...re-sub-dependency/sub/~master/sub/dub.sdl b/.../issue813-pure-sub-dependency/sub/dub.sdl → ...re-sub-dependency/sub/~master/sub/dub.sdl
diff --git a/...ue813-pure-sub-dependency/sub/sub/dub.sdl → ...ub-dependency/sub/~master/sub/sub/dub.sdl b/...ue813-pure-sub-dependency/sub/sub/dub.sdl → ...ub-dependency/sub/~master/sub/sub/dub.sdl
diff --git a/...ure-sub-dependency/sub/sub/src/sub/test.d → ...ndency/sub/~master/sub/sub/src/sub/test.d b/...ure-sub-dependency/sub/sub/src/sub/test.d → ...ndency/sub/~master/sub/sub/src/sub/test.d
diff --git a/test/issue923-subpackage-deps.sh b/test/issue923-subpackage-deps.sh
@@ -2,13 +2,10 @@
 
 . $(dirname "${BASH_SOURCE[0]}")/common.sh
 cd ${CURR_DIR}/issue923-subpackage-deps
-rm -rf main/.dub
-rm -rf a/.dub
-rm -rf b/.dub
-rm -f main/dub.selections.json
-${DUB} build --bare --compiler=${DC} main
+rm -f main/~master/main/dub.selections.json
+${DUB} build -f --bare --compiler=${DC} main
 
 
-if ! grep -c -e \"b\" main/dub.selections.json; then
+if ! grep -c -e \"b\" main/~master/main/dub.selections.json; then
 	die $LINENO 'Dependency b not resolved.'
 fi
diff --git a/test/issue923-subpackage-deps/a/dub.sdl → ...ssue923-subpackage-deps/a/1.0.0/a/dub.sdl b/test/issue923-subpackage-deps/a/dub.sdl → ...ssue923-subpackage-deps/a/1.0.0/a/dub.sdl
diff --git a/test/issue923-subpackage-deps/b/dub.sdl → ...ssue923-subpackage-deps/b/1.0.0/b/dub.sdl b/test/issue923-subpackage-deps/b/dub.sdl → ...ssue923-subpackage-deps/b/1.0.0/b/dub.sdl
diff --git a/test/issue923-subpackage-deps/b/source/b.d → ...e923-subpackage-deps/b/1.0.0/b/source/b.d b/test/issue923-subpackage-deps/b/source/b.d → ...e923-subpackage-deps/b/1.0.0/b/source/b.d
diff --git a/test/issue923-subpackage-deps/main/dub.sdl → ...subpackage-deps/main/~master/main/dub.sdl b/test/issue923-subpackage-deps/main/dub.sdl → ...subpackage-deps/main/~master/main/dub.sdl
diff --git a/...ssue923-subpackage-deps/main/source/app.d → ...ckage-deps/main/~master/main/source/app.d b/...ssue923-subpackage-deps/main/source/app.d → ...ckage-deps/main/~master/main/source/app.d