From 5e8f2220a7d9534ee3ae7b91e59af1d1222dd023 Mon Sep 17 00:00:00 2001 From: KGrzeg Date: Fri, 3 Sep 2021 13:52:59 +0200 Subject: [PATCH 1/3] Bump to the latest ohnet --- .github/workflows/release.yml | 6 +++--- projectdata/dependencies.json | 16 +++++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1cb12b9b0..300c0ef89 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: run: | pip install boto3 conan install . --build=missing - git clone https://github.com/merakiacoustic/ohdevtools ../ohdevtools + git clone https://github.com/merakiacoustic/ohdevtools ../ohdevtools -b fix-external-deps ./go fetch ohNet mkdir -p dependencies/AnyPlatform git clone https://github.com/merakiacoustic/ohWafHelpers.git -b enable-upstream-libressl dependencies/AnyPlatform/ohWafHelpers @@ -85,7 +85,7 @@ jobs: run: | pip install boto3 conan install . --build=missing - git clone https://github.com/merakiacoustic/ohdevtools ../ohdevtools + git clone https://github.com/merakiacoustic/ohdevtools ../ohdevtools -b fix-external-deps ./go fetch ohNet mkdir -p dependencies/AnyPlatform git clone https://github.com/merakiacoustic/ohWafHelpers.git -b enable-upstream-libressl dependencies/AnyPlatform/ohWafHelpers @@ -136,7 +136,7 @@ jobs: run: | pip install boto3 conan install . --build=missing - git clone https://github.com/merakiacoustic/ohdevtools ../ohdevtools + git clone https://github.com/merakiacoustic/ohdevtools ../ohdevtools -b fix-external-deps ./go fetch ohNet mkdir -p dependencies/AnyPlatform git clone https://github.com/merakiacoustic/ohWafHelpers.git -b enable-upstream-libressl dependencies/AnyPlatform/ohWafHelpers diff --git a/projectdata/dependencies.json b/projectdata/dependencies.json index e206a8b8e..c73a69c36 100644 --- a/projectdata/dependencies.json +++ b/projectdata/dependencies.json @@ -1,15 +1,17 @@ [ - { "name": "ohNet", - "type": "openhome", + { + "name": "ohNet", + "type": "external", "platform-specific": true, - "version": "1.31.4245", - "archive-suffix": "-${debugmode}", - "main-dir": "${dest}${name}-${platform}-${debugmode}", + "version": "1.32.4350", + "cross-check": false, + "archive-filename": "${name}-${platform}-${debugmode}.tar.gz", + "archive-path": "https://github.com/KGrzeg/ohNet/releases/download/ohNet_${version}/${archive-filename}", + "dest": "dependencies/${platform}/", "configure-args": [ "--ohnet-lib-dir", "${main-dir}/lib", "--ohnet-include-dir", "${main-dir}/include/ohnet" - ], - "source-git": "https://github.com/openhome/ohNet.git" + ] }, { "name": "TestTones", "type": "external", From 2c3837abbf07dc742aec4fd2378fe56a9a644b01 Mon Sep 17 00:00:00 2001 From: KGrzeg Date: Mon, 6 Sep 2021 13:16:23 +0200 Subject: [PATCH 2/3] switch repo to merakiacoustic --- projectdata/dependencies.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projectdata/dependencies.json b/projectdata/dependencies.json index c73a69c36..bfa368336 100644 --- a/projectdata/dependencies.json +++ b/projectdata/dependencies.json @@ -6,7 +6,7 @@ "version": "1.32.4350", "cross-check": false, "archive-filename": "${name}-${platform}-${debugmode}.tar.gz", - "archive-path": "https://github.com/KGrzeg/ohNet/releases/download/ohNet_${version}/${archive-filename}", + "archive-path": "https://github.com/merakiacoustic/ohNet/releases/download/ohNet_${version}/${archive-filename}", "dest": "dependencies/${platform}/", "configure-args": [ "--ohnet-lib-dir", "${main-dir}/lib", From e7c73f405a0e1dd64ad167bb20e13d38a9d153a9 Mon Sep 17 00:00:00 2001 From: KGrzeg Date: Mon, 6 Sep 2021 13:17:36 +0200 Subject: [PATCH 3/3] grab from ohdevtools master --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 300c0ef89..1cb12b9b0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,7 @@ jobs: run: | pip install boto3 conan install . --build=missing - git clone https://github.com/merakiacoustic/ohdevtools ../ohdevtools -b fix-external-deps + git clone https://github.com/merakiacoustic/ohdevtools ../ohdevtools ./go fetch ohNet mkdir -p dependencies/AnyPlatform git clone https://github.com/merakiacoustic/ohWafHelpers.git -b enable-upstream-libressl dependencies/AnyPlatform/ohWafHelpers @@ -85,7 +85,7 @@ jobs: run: | pip install boto3 conan install . --build=missing - git clone https://github.com/merakiacoustic/ohdevtools ../ohdevtools -b fix-external-deps + git clone https://github.com/merakiacoustic/ohdevtools ../ohdevtools ./go fetch ohNet mkdir -p dependencies/AnyPlatform git clone https://github.com/merakiacoustic/ohWafHelpers.git -b enable-upstream-libressl dependencies/AnyPlatform/ohWafHelpers @@ -136,7 +136,7 @@ jobs: run: | pip install boto3 conan install . --build=missing - git clone https://github.com/merakiacoustic/ohdevtools ../ohdevtools -b fix-external-deps + git clone https://github.com/merakiacoustic/ohdevtools ../ohdevtools ./go fetch ohNet mkdir -p dependencies/AnyPlatform git clone https://github.com/merakiacoustic/ohWafHelpers.git -b enable-upstream-libressl dependencies/AnyPlatform/ohWafHelpers