From c4f6c86999ec8fe3b610ac269a121c9fa424daf5 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 23 Oct 2021 19:49:43 -0400 Subject: dlang dub & nix build related, includes dep update - nix-shell --pure - nix-build - dub build --compiler=ldc2 --build=release --force --- src/ext_depends/D-YAML.meta | 2 +- src/ext_depends/D-YAML/.github/workflows/d.yml | 73 +++++++++++ src/ext_depends/D-YAML/docs/logo.svg | 147 ++++++++++++++++++++++ src/ext_depends/D-YAML/meson.build | 2 +- src/ext_depends/D-YAML/source/dyaml/emitter.d | 2 +- src/ext_depends/D-YAML/source/dyaml/representer.d | 2 +- 6 files changed, 224 insertions(+), 4 deletions(-) create mode 100644 src/ext_depends/D-YAML/.github/workflows/d.yml create mode 100644 src/ext_depends/D-YAML/docs/logo.svg (limited to 'src/ext_depends') diff --git a/src/ext_depends/D-YAML.meta b/src/ext_depends/D-YAML.meta index acad016..2f596f2 100644 --- a/src/ext_depends/D-YAML.meta +++ b/src/ext_depends/D-YAML.meta @@ -1,3 +1,3 @@ -D-YAML ff5ec445 +D-YAML a6805551 https://github.com/dlang-community/D-YAML Boost Software License 1.0 (BSL-1.0) diff --git a/src/ext_depends/D-YAML/.github/workflows/d.yml b/src/ext_depends/D-YAML/.github/workflows/d.yml new file mode 100644 index 0000000..08f583f --- /dev/null +++ b/src/ext_depends/D-YAML/.github/workflows/d.yml @@ -0,0 +1,73 @@ +name: D + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + strategy: + matrix: + dc: + - dmd-latest + - ldc-latest + - dmd-beta + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: dlang-community/setup-dlang@4c99aa991ce7d19dd3064de0a4f2f6b2f152e2d7 + with: + compiler: ${{ matrix.dc }} + - name: 'Test' + run: | + dub test --build=unittest-cov + bash <(curl -s https://codecov.io/bash) + examples: + runs-on: ubuntu-latest + needs: build + steps: + - uses: actions/checkout@v2 + - uses: dlang-community/setup-dlang@4c99aa991ce7d19dd3064de0a4f2f6b2f152e2d7 + with: + compiler: dmd-latest + - name: 'Build Examples' + run: | + dub build dyaml:benchmark + dub build dyaml:constructor + dub build dyaml:getting-started + dub build dyaml:representer + dub build dyaml:resolver + dub build dyaml:testsuite + dub build dyaml:tojson + dub build dyaml:yaml_gen + dub build dyaml:yaml_stats + ninja: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: dlang-community/setup-dlang@4c99aa991ce7d19dd3064de0a4f2f6b2f152e2d7 + with: + compiler: dmd-latest + - name: 'Install dependencies' + run: | + sudo apt-get install python3-pip python3-setuptools python3-wheel ninja-build + sudo pip3 install meson + - name: 'Build' + run: | + export PATH=$PATH:$PWD/.ntmp + meson build && ninja -j8 -C build + ninja -j8 -C build test -v + yaml-test-suite: + runs-on: ubuntu-latest + needs: build + steps: + - uses: actions/checkout@v2 + - uses: dlang-community/setup-dlang@4c99aa991ce7d19dd3064de0a4f2f6b2f152e2d7 + with: + compiler: dmd-latest + - name: 'Run YAML test suite' + run: | + git clone https://github.com/yaml/yaml-test-suite + dub run dyaml:testsuite diff --git a/src/ext_depends/D-YAML/docs/logo.svg b/src/ext_depends/D-YAML/docs/logo.svg new file mode 100644 index 0000000..0683284 --- /dev/null +++ b/src/ext_depends/D-YAML/docs/logo.svg @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext_depends/D-YAML/meson.build b/src/ext_depends/D-YAML/meson.build index 68d17c7..8a09d6a 100644 --- a/src/ext_depends/D-YAML/meson.build +++ b/src/ext_depends/D-YAML/meson.build @@ -1,7 +1,7 @@ project('D-YAML', 'd', meson_version: '>=0.40.0', subproject_dir: 'contrib', - version: '0.8.0' + version: '0.8.4' ) project_soversion = '0' diff --git a/src/ext_depends/D-YAML/source/dyaml/emitter.d b/src/ext_depends/D-YAML/source/dyaml/emitter.d index c797eb9..a436c7c 100644 --- a/src/ext_depends/D-YAML/source/dyaml/emitter.d +++ b/src/ext_depends/D-YAML/source/dyaml/emitter.d @@ -906,7 +906,7 @@ struct Emitter(Range, CharType) if (isOutputRange!(Range, CharType)) { string tagString = tag; - if(tagString == "!"){return tagString;} + if (tagString == "!") return "!"; string handle; string suffix = tagString; diff --git a/src/ext_depends/D-YAML/source/dyaml/representer.d b/src/ext_depends/D-YAML/source/dyaml/representer.d index a7ca802..98c825b 100644 --- a/src/ext_depends/D-YAML/source/dyaml/representer.d +++ b/src/ext_depends/D-YAML/source/dyaml/representer.d @@ -142,7 +142,7 @@ Node representData(const Node data, ScalarStyle defaultScalarStyle, CollectionSt { // Float comparison is pretty unreliable... auto result = representData(Node(1.0), ScalarStyle.invalid, CollectionStyle.invalid); - assert(approxEqual(result.as!string.to!real, 1.0)); + assert(isClose(result.as!string.to!real, 1.0)); assert(result.tag == "tag:yaml.org,2002:float"); assert(representData(Node(real.nan), ScalarStyle.invalid, CollectionStyle.invalid) == Node(".nan", "tag:yaml.org,2002:float")); -- cgit v1.2.3