From 4946d49abdc35810254151923bab30fb3cc2c004 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Wed, 4 Jan 2023 17:39:05 +0100 Subject: [PATCH] upgrade msgpack to ~>1.0, add dub.selections.json Fixes msgpack-d deprecations, allows minor bumps upstream The dub.selections.json allows --- .github/workflows/ci.yml | 10 ++++++++-- .gitignore | 1 + common/dub.sdl | 2 +- dub.selections.json | 10 ++++++++++ 4 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 dub.selections.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8048f38..c114d8e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,8 +44,8 @@ jobs: - name: Build run: | - rdmd ./d-test-utils/test_with_package.d $LIBDPARSE_VERSION libdparse -- dub build --build=${{ matrix.build }} --config=client --arch=${{ matrix.arch }} - rdmd ./d-test-utils/test_with_package.d $LIBDPARSE_VERSION libdparse -- dub build --build=${{ matrix.build }} --config=server --arch=${{ matrix.arch }} + dub build --build=${{ matrix.build }} --config=client --arch=${{ matrix.arch }} + dub build --build=${{ matrix.build }} --config=server --arch=${{ matrix.arch }} # Tests @@ -65,6 +65,12 @@ jobs: cd dsymbol rdmd ../d-test-utils/test_with_package.d $LIBDPARSE_VERSION libdparse -- dub test + # test that both lowest supplied and highest available libdparse versions are compatible (for DUB users depending on DCD) + - name: Test dependency versions + run: | + rdmd ./d-test-utils/test_with_package.d $LIBDPARSE_VERSION libdparse -- dub build --build=${{ matrix.build }} --config=client --arch=${{ matrix.arch }} + rdmd ./d-test-utils/test_with_package.d $LIBDPARSE_VERSION libdparse -- dub build --build=${{ matrix.build }} --config=server --arch=${{ matrix.arch }} + - name: Linux Tests if: contains(matrix.os, 'ubuntu') run: | diff --git a/.gitignore b/.gitignore index 5e9ad8b..77f68b9 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ stdout.txt # Dub files .dub dub.selections.json +!/dub.selections.json diff --git a/common/dub.sdl b/common/dub.sdl index 0893658..57b7c42 100644 --- a/common/dub.sdl +++ b/common/dub.sdl @@ -5,5 +5,5 @@ preBuildCommands "\"$DC\" -run \"$PACKAGE_DIR/dubhash.d\"" sourcePaths "src" importPaths "src" -dependency "msgpack-d" version="1.0.1" +dependency "msgpack-d" version="~>1.0" versions "built_with_dub" diff --git a/dub.selections.json b/dub.selections.json new file mode 100644 index 0000000..3a84987 --- /dev/null +++ b/dub.selections.json @@ -0,0 +1,10 @@ +{ + "fileVersion": 1, + "versions": { + "dsymbol": "0.14.1", + "emsi_containers": "0.9.0", + "libdparse": "0.21.1", + "msgpack-d": "1.0.4", + "stdx-allocator": "2.77.5" + } +}