From 01a086d5e27731fc504a3715116533a8d5d8dadb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Ludwig?= Date: Mon, 7 Sep 2020 23:08:12 +0200 Subject: [PATCH 1/5] Fix bogus warning for non-path based dependencies. Introduced by #1974. --- source/dub/dub.d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/dub/dub.d b/source/dub/dub.d index 521538bf7..c35d89e6f 100644 --- a/source/dub/dub.d +++ b/source/dub/dub.d @@ -1596,7 +1596,7 @@ private class DependencyVersionResolver : DependencyResolver!(Dependency, Depend auto altdeppath = d.name == dbasename ? basepack.path : subpack.path; altdeppath.endsWithSlash = true; - if (absdeppath != desireddeppath) + if (!d.spec.path.empty && absdeppath != desireddeppath) logWarn("Warning: Sub package %s, referenced by %s %s must be referenced using the path to its base package", subpack.name, pack.name, pack.version_); From 01abab7993cc1dbf52a9a5923b72f38d0f86b70c Mon Sep 17 00:00:00 2001 From: Martin Nowak Date: Thu, 17 Sep 2020 10:09:02 +0200 Subject: [PATCH 2/5] update version to v1.23.0-rc.1 --- source/dub/version_.d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/dub/version_.d b/source/dub/version_.d index 5469fd135..ff030597a 100644 --- a/source/dub/version_.d +++ b/source/dub/version_.d @@ -1,2 +1,2 @@ module dub.version_; -enum dubVersion = "v1.23.0-beta.1"; +enum dubVersion = "v1.23.0-rc.1"; From bbe6316fb456735463e781da8628d2b05ee89d7e Mon Sep 17 00:00:00 2001 From: Geod24 Date: Thu, 17 Sep 2020 18:08:00 +0900 Subject: [PATCH 3/5] Improve output of toolchain requirements test, workaround heisenbug There is currently an Heisenbug in Github CI where dub fails to run the program. E.g. we see the following in the logs: --- Performing "debug" build using ldc2 for x86_64. dubtest1531 ~master: building configuration "application"... Linking... Running ../../../../../tmp/dubtest1531_2enU78/dubtest1531 Failed to execute program (No such file or directory) [ERROR] -e:79 Did not pass with ldc="<=1.23.0" [ERROR] Script failure. --- This works around said bug by only building the package, but not running it. --- test/issue1531-toolchain-requirements.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/issue1531-toolchain-requirements.sh b/test/issue1531-toolchain-requirements.sh index 00eb8ee88..638167aa5 100755 --- a/test/issue1531-toolchain-requirements.sh +++ b/test/issue1531-toolchain-requirements.sh @@ -75,12 +75,14 @@ EOF # pass test compiler requirement given as $1 function test_cl_req_pass { + echo "Expecting success on '$DC $1'" 2>&1 write_cl_req $1 - $DUB --compiler=$DC --root=$TMPDIR || die $LINENO "Did not pass with $DC_NAME=\"$1\"" + $DUB build -q --compiler=$DC --root=$TMPDIR || die $LINENO "Did not pass with $DC_NAME=\"$1\"" } # fail test compiler requirement given as $1 function test_cl_req_fail { + echo "Expecting failure on '$DC $1'" 2>&1 write_cl_req $1 ! $DUB --compiler=$DC --root=$TMPDIR || die $LINENO "Did not fail with $DC_NAME=\"$1\"" } From 4395f8f8fc9a8b3d47fec5e09b002ac75e3b2083 Mon Sep 17 00:00:00 2001 From: Martin Nowak Date: Tue, 22 Sep 2020 10:38:09 +0200 Subject: [PATCH 4/5] update version to v1.23.0 --- source/dub/version_.d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/dub/version_.d b/source/dub/version_.d index ff030597a..cba7e77bb 100644 --- a/source/dub/version_.d +++ b/source/dub/version_.d @@ -1,2 +1,2 @@ module dub.version_; -enum dubVersion = "v1.23.0-rc.1"; +enum dubVersion = "v1.23.0"; From 57880ae46de5c4366dde5a578018a952dca9ce44 Mon Sep 17 00:00:00 2001 From: Martin Nowak Date: Fri, 25 Sep 2020 12:17:44 +0200 Subject: [PATCH 5/5] purge changelog --- changelog/add_x86_omf.dd | 5 ----- changelog/dub-remove.dd | 9 --------- changelog/enforce_proper_package_loading.dd | 8 -------- changelog/git-paths.dd | 16 ---------------- changelog/version.dd | 8 -------- 5 files changed, 46 deletions(-) delete mode 100644 changelog/add_x86_omf.dd delete mode 100644 changelog/dub-remove.dd delete mode 100644 changelog/enforce_proper_package_loading.dd delete mode 100644 changelog/git-paths.dd delete mode 100644 changelog/version.dd diff --git a/changelog/add_x86_omf.dd b/changelog/add_x86_omf.dd deleted file mode 100644 index dab726ccc..000000000 --- a/changelog/add_x86_omf.dd +++ /dev/null @@ -1,5 +0,0 @@ -Added architecture x86_omf for windows-dmd - -On windows dmd the x86_omf architecture can now be used as platform -specification using `--arch=x86_omf`. This is currently equivalent to -the previously existing `--arch=x86` argument. diff --git a/changelog/dub-remove.dd b/changelog/dub-remove.dd deleted file mode 100644 index b297d45c3..000000000 --- a/changelog/dub-remove.dd +++ /dev/null @@ -1,9 +0,0 @@ -`dub remove --non-interactive` will now remove all packages by default - -When calling a command with a package name and no version specification, -the latest version is usually assumed. -While this behavior makes sense for `dub fetch` or `dub run`, -it can come as a surprise when cleaning up local packages through `dub remove`, -and so previous version would simply error out when more than one version was available. -From this version, `dub remove -n $PKGNAME` will just remove all cached versions -of the package named `$PKGNAME`, without asking you to use `$PKGNAME@*`. diff --git a/changelog/enforce_proper_package_loading.dd b/changelog/enforce_proper_package_loading.dd deleted file mode 100644 index 6faa00fc3..000000000 --- a/changelog/enforce_proper_package_loading.dd +++ /dev/null @@ -1,8 +0,0 @@ -Running `dub upgrade` on a package-less folder is now a no-op - -Prior to this change, accidentally running `dub upgrade` in a folder -where no `dub.json` / `dub.sdl` was present would leave you with a -`dub.selections.json` and, in some instances, an empty `.dub` folder. -This has been fixed and running `dub upgrade` where one shouldn't -will now only generate a friendly error message. - diff --git a/changelog/git-paths.dd b/changelog/git-paths.dd deleted file mode 100644 index 33447b73b..000000000 --- a/changelog/git-paths.dd +++ /dev/null @@ -1,16 +0,0 @@ -Support dependencies as git url with exact commit - -Git repositories can be directly used by dub as dependencies. - -dub.json: -------- -{ - "name": "git-dependency", - "dependencies": { - "gitcompatibledubpackage": { - "repository": "git+https://github.com/dlang-community/gitcompatibledubpackage.git", - "version": "ccb31bf6a655437176ec02e04c2305a8c7c90d67" - } - } -} -------- diff --git a/changelog/version.dd b/changelog/version.dd deleted file mode 100644 index 9f16b5338..000000000 --- a/changelog/version.dd +++ /dev/null @@ -1,8 +0,0 @@ -All commands now support `package[@]`, `--version` is deprecated - -`dub` commands had some disparity in their version handling. -Most commands accepting a package name (e.g. `dub fetch` or `dub run`) supported -either `package[@version-spec]`, or supported only `package` and accepted an -option `--version=`. -The latter form has now been deprecated and all commands now accept `package[@]`. -Note that the absence of `@` still means "latest version" (except for `remove`).