diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 9e4e167..b87cace 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-latest strategy: matrix: osx_64_: diff --git a/recipe/bld.bat b/recipe/bld.bat index 6366631..0e4916a 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -15,7 +15,7 @@ cmake -G Ninja ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^ -DCMAKE_INCLUDE_PATH:PATH="%LIBRARY_INC%" ^ - -DBULID_REMOTE_TESTS=OFF ^ + -DBUILD_EXAMPLES=OFF ^ .. if errorlevel 1 exit 1 ninja install diff --git a/recipe/build.sh b/recipe/build.sh index 1de4535..11fbb33 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -13,7 +13,8 @@ cd build cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="$PREFIX" \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DJSONARANGO_BUILD_EXAMPLES=OFF \ + -DEnableSSE=OFF \ + -DBUILD_EXAMPLES=OFF \ .. # Build step make -j${CPU_COUNT} diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2127564..b402819 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,26 +1,32 @@ -{% set version = "0.4.0" %} +{% set version = "0.5.0" %} package: name: jsonarango version: {{ version }} source: - url: https://bitbucket.org/gems4/jsonarango/get/v{{ version }}.tar.gz - sha256: 0b559c03fcc0656856e80cfc2c20d3ef19658014b1a30000cccf1d8557f7ca73 + git_url: https://bitbucket.org/gems4/jsonarango.git + git_rev: v{{ version }} + git_depth: 3 build: - number: 1 + number: 0 skip: true # [win and vc<14] requirements: build: - {{ compiler('cxx') }} - cmake - - ninja # [win] + - ninja - make + - ccache # [unix] host: + - git - curl - - velocypack + - spdlog >=1.10.0 + - ccache # [unix] + - nlohmann_json + test: commands: