From 5db07ea3dcddba27c581316c3b53f4892cc65982 Mon Sep 17 00:00:00 2001 From: Martin Nowak Date: Wed, 7 Nov 2018 14:55:09 +0100 Subject: [PATCH 1/2] Revert "Merge pull request #318 from wilzbach/fix-dub" This reverts commit 03715827567ff6a998436e224fb8c8b978ed9a1a, reversing changes made to 35b806cb7746199d47f0c629e7f737570c614b6d. --- buildkite/build_project.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/buildkite/build_project.sh b/buildkite/build_project.sh index fadc3292..7e5ae474 100755 --- a/buildkite/build_project.sh +++ b/buildkite/build_project.sh @@ -150,12 +150,8 @@ case "$REPO_FULL_NAME" in dlang/dub) rm test/issue895-local-configuration.sh # FIXME rm test/issue884-init-defer-file-creation.sh # FIXME - # GitHub's UI/API doesn't return 0.9.20 anymore - # Thus 0.9.20 isn't available on the dub registry anymore - sed 's/0[.]9[.]20/1.9.0/g' -i test/interactive-remove.sh - sed 's/0[\][.]9[\][.]20/1.9.0/' -i test/interactive-remove.sh - sed 's/0[.]9[.]21/1.10.0/g' -i test/interactive-remove.sh - sed 's/0[\][.]9[\][.]21/1.10.0/g' -i test/interactive-remove.sh + sed 's/"stdx-allocator": "2.77.0",/"stdx-allocator": "2.77.2",/' -i dub.selections.json # upgrade stdx-allocator (can be removed once v1.11 gets released) + rm test/ddox.sh # can be removed once v1.11 gets released sed -i '/^source.*activate/d' travis-ci.sh DC=$DC ./travis-ci.sh ;; From 899b99a59dfc9f7fb2edc20e79041ddfef71234c Mon Sep 17 00:00:00 2001 From: Martin Nowak Date: Wed, 7 Nov 2018 14:56:12 +0100 Subject: [PATCH 2/2] remove dub workaround now that v1.11.0 is released --- buildkite/build_project.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/buildkite/build_project.sh b/buildkite/build_project.sh index 7e5ae474..38227bc1 100755 --- a/buildkite/build_project.sh +++ b/buildkite/build_project.sh @@ -150,8 +150,6 @@ case "$REPO_FULL_NAME" in dlang/dub) rm test/issue895-local-configuration.sh # FIXME rm test/issue884-init-defer-file-creation.sh # FIXME - sed 's/"stdx-allocator": "2.77.0",/"stdx-allocator": "2.77.2",/' -i dub.selections.json # upgrade stdx-allocator (can be removed once v1.11 gets released) - rm test/ddox.sh # can be removed once v1.11 gets released sed -i '/^source.*activate/d' travis-ci.sh DC=$DC ./travis-ci.sh ;;