From cce327e676df16b6eade7a79045e51331fd11886 Mon Sep 17 00:00:00 2001 From: "Schaich, Alonso" Date: Sun, 11 Feb 2024 16:20:24 +0900 Subject: [PATCH 01/12] Add vcpkg submodule --- .gitmodules | 3 +++ vcpkg | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 vcpkg diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..fe07c99 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "vcpkg"] + path = vcpkg + url = https://github.com/microsoft/vcpkg diff --git a/vcpkg b/vcpkg new file mode 160000 index 0000000..345ac44 --- /dev/null +++ b/vcpkg @@ -0,0 +1 @@ +Subproject commit 345ac44ab8d6a16239d3af55df9608bf725e7a48 From ddfd4d08b4eec9cfbc4a4a76f03deb6cb7f94259 Mon Sep 17 00:00:00 2001 From: "Schaich, Alonso" Date: Sun, 11 Feb 2024 16:21:01 +0900 Subject: [PATCH 02/12] Make checkout strategy recursive --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b1cece7..4df7981 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,6 +15,8 @@ jobs: MYTOKEN2: "value2" steps: - uses: actions/checkout@v4 + with: + submodules: 'recursive' - name: Test in FreeBSD id: test uses: vmactions/freebsd-vm@v1 @@ -25,6 +27,7 @@ jobs: pkg install -y curl run: | + ls -l vcpkg pwd ls -lah whoami From 139fa2a48850c64258dd2d7f3109a9dae6b4c0b2 Mon Sep 17 00:00:00 2001 From: "Schaich, Alonso" Date: Sun, 11 Feb 2024 16:28:56 +0900 Subject: [PATCH 03/12] Execute vcpkg --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4df7981..563933e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,9 +27,10 @@ jobs: pkg install -y curl run: | - ls -l vcpkg pwd ls -lah whoami env freebsd-version + sh vcpkg/bootstrap.sh + ls -l vcpkg From 37e61f20ad2a793e43eef1e793c74d0e08211192 Mon Sep 17 00:00:00 2001 From: "Schaich, Alonso" Date: Sun, 11 Feb 2024 16:37:14 +0900 Subject: [PATCH 04/12] Fix typo --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 563933e..b03979c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,5 +32,5 @@ jobs: whoami env freebsd-version - sh vcpkg/bootstrap.sh + sh vcpkg/bootstrap-vcpkg.sh ls -l vcpkg From 5c699754327ef2b8dcd25621173455a7528603dd Mon Sep 17 00:00:00 2001 From: "Schaich, Alonso" Date: Sun, 11 Feb 2024 16:42:59 +0900 Subject: [PATCH 05/12] Install cmake --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b03979c..dc4fa40 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: envs: 'MYTOKEN MYTOKEN2' usesh: true prepare: | - pkg install -y curl + pkg install -y curl cmake run: | pwd From 56e316bd8d8aba13af478afdb7f21c7b90f8fafa Mon Sep 17 00:00:00 2001 From: "Schaich, Alonso" Date: Sun, 11 Feb 2024 16:43:13 +0900 Subject: [PATCH 06/12] Install zip and unzip --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dc4fa40..6792492 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: envs: 'MYTOKEN MYTOKEN2' usesh: true prepare: | - pkg install -y curl cmake + pkg install -y curl cmake zip unzip run: | pwd From fb80311b744efa6ecc93e205939d13a6217a5164 Mon Sep 17 00:00:00 2001 From: "Schaich, Alonso" Date: Sun, 11 Feb 2024 16:47:51 +0900 Subject: [PATCH 07/12] Transport errors --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6792492..9ee43c7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,6 +27,7 @@ jobs: pkg install -y curl cmake zip unzip run: | + set -e pwd ls -lah whoami From 030c2643e4a2b90118785e86fb26ed040dbb5bb8 Mon Sep 17 00:00:00 2001 From: "Schaich, Alonso" Date: Sun, 11 Feb 2024 16:52:56 +0900 Subject: [PATCH 08/12] Install ninja --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9ee43c7..137f032 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,7 +24,7 @@ jobs: envs: 'MYTOKEN MYTOKEN2' usesh: true prepare: | - pkg install -y curl cmake zip unzip + pkg install -y curl cmake ninja unzip zip run: | set -e From 43e8effc78be9f57152d43e4e6a33b496c98d135 Mon Sep 17 00:00:00 2001 From: "Schaich, Alonso" Date: Mon, 12 Feb 2024 06:40:49 +0900 Subject: [PATCH 09/12] Install zlib --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 137f032..91ee731 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,4 +34,5 @@ jobs: env freebsd-version sh vcpkg/bootstrap-vcpkg.sh + vcpkg/vcpkg install zlib ls -l vcpkg From 39bcd273d0bb96d485486c1b451a9be687041e9c Mon Sep 17 00:00:00 2001 From: "Schaich, Alonso" Date: Mon, 12 Feb 2024 07:16:56 +0900 Subject: [PATCH 10/12] Install git --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 91ee731..b121c0a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,6 +25,7 @@ jobs: usesh: true prepare: | pkg install -y curl cmake ninja unzip zip + pkg install -y git run: | set -e From d67c404c1fd46c7320824de53bf85c22c93d5fcd Mon Sep 17 00:00:00 2001 From: "Schaich, Alonso" Date: Mon, 12 Feb 2024 08:41:35 +0900 Subject: [PATCH 11/12] Install pkgconf --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b121c0a..d05fb4d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,7 +25,7 @@ jobs: usesh: true prepare: | pkg install -y curl cmake ninja unzip zip - pkg install -y git + pkg install -y git pkgconf run: | set -e From 2704f399e66fc458b8dc065e7294fae51bc78461 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Mon, 12 Feb 2024 14:20:09 +0000 Subject: [PATCH 12/12] Try using nuget --- .github/workflows/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d05fb4d..d37450c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,8 +26,11 @@ jobs: prepare: | pkg install -y curl cmake ninja unzip zip pkg install -y git pkgconf + pkg install -y mono + fetch -o /usr/local/bin/nuget https://dist.nuget.org/win-x86-commandline/latest/nuget.exe run: | + mono /usr/local/bin/nuget q set -e pwd ls -lah @@ -36,4 +39,4 @@ jobs: freebsd-version sh vcpkg/bootstrap-vcpkg.sh vcpkg/vcpkg install zlib - ls -l vcpkg + mono $(vcpkg/vcpkg fetch nuget) list