Merge remote-tracking branch 'upstream/stable' into merge_stable

Conflicts: source/dub/version_.d
dlang · Sep 25, 2020 · e919280 · e919280
2 parents 29d33f2 + 57880ae
commit e919280
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 48 deletions.
diff --git a/changelog/add_x86_omf.dd b/changelog/add_x86_omf.dd
diff --git a/changelog/dub-remove.dd b/changelog/dub-remove.dd
diff --git a/changelog/enforce_proper_package_loading.dd b/changelog/enforce_proper_package_loading.dd
diff --git a/changelog/git-paths.dd b/changelog/git-paths.dd
diff --git a/changelog/version.dd b/changelog/version.dd
diff --git 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";
diff --git 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\""
 }