From e37ef25361899ee856c4735ceee2b6d8d754602c Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 10:07:01 +0300 Subject: [PATCH 01/48] - --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e325364..73bc0ed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@v4 - name: Export GitHub Actions cache environment variables - uses: actions/github-script@v7 + uses: actions/github-script@v2 with: debug: true script: | From a6ca4353c02cc4cd9bde91b4c65775ff8814efd8 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 10:08:36 +0300 Subject: [PATCH 02/48] - --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 73bc0ed..6994f0d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@v4 - name: Export GitHub Actions cache environment variables - uses: actions/github-script@v2 + uses: actions/github-script@v6 with: debug: true script: | From 4ed7ac68ddff6e42493f0464eaae1d4e8cb91c20 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 10:17:11 +0300 Subject: [PATCH 03/48] - --- .github/workflows/build.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6994f0d..2e0b8c0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,10 +38,18 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Expose GitHub Runtime + uses: crazy-max/ghaction-github-runtime@v3 + + - name: Env + run: | + # ACTIONS_RUNTIME_TOKEN, ACTIONS_RUNTIME_URL should be exposed + env|sort + - name: Export GitHub Actions cache environment variables - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: - debug: true + debug: false script: | core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); From c28375c938f751c70699eb1d84eb693ebfb7ebc4 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 10:28:17 +0300 Subject: [PATCH 04/48] - --- .github/workflows/build.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e0b8c0..37964fa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,13 +46,17 @@ jobs: # ACTIONS_RUNTIME_TOKEN, ACTIONS_RUNTIME_URL should be exposed env|sort - - name: Export GitHub Actions cache environment variables - uses: actions/github-script@v7 + # Cache vcpkg + - name: Cache vcpkg + id: cache-vcpkg + uses: actions/cache@v4 with: - debug: false - script: | - core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); - core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); + path: | + ${{ env.VCPKG_INSTALLATION_ROOT }}/installed + ${{ env.VCPKG_INSTALLATION_ROOT }}/downloads + key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/vcpkg.json') }} + restore-keys: | + ${{ runner.os }}-vcpkg- - name: vcpkg install run: | From e12577e3dbc9e4656ce1c08aedf30438675e778a Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 10:45:04 +0300 Subject: [PATCH 05/48] - --- .github/workflows/build.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 37964fa..d2f63ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,14 +38,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Expose GitHub Runtime - uses: crazy-max/ghaction-github-runtime@v3 - - - name: Env - run: | - # ACTIONS_RUNTIME_TOKEN, ACTIONS_RUNTIME_URL should be exposed - env|sort - # Cache vcpkg - name: Cache vcpkg id: cache-vcpkg From 7aaebe79062536c608c7267aa05b5ab561b719b7 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 10:47:27 +0300 Subject: [PATCH 06/48] - --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d2f63ce..a006fb5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,8 +11,6 @@ on: jobs: build: - env: - VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" runs-on: ${{ matrix.os }} strategy: From ebd9d7a4ba670d79cbde1d48165736af47af0afe Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 10:50:16 +0300 Subject: [PATCH 07/48] - --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a006fb5..7b3fcc6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,6 +33,10 @@ jobs: run: | #pip3 install opencv-python pytest + - name: Env + run: | + env|sort + - name: Checkout uses: actions/checkout@v4 From 57d0725e4649f572358c687cd13a7b714d8391b6 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 10:57:16 +0300 Subject: [PATCH 08/48] - --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7b3fcc6..4ede4b8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,14 +46,18 @@ jobs: uses: actions/cache@v4 with: path: | - ${{ env.VCPKG_INSTALLATION_ROOT }}/installed ${{ env.VCPKG_INSTALLATION_ROOT }}/downloads + ${{ env.VCPKG_INSTALLATION_ROOT }}/packages + ${ env.VCPKG_INSTALLATION_ROOT }/downloads + ${ env.VCPKG_INSTALLATION_ROOT }/packages key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/vcpkg.json') }} restore-keys: | ${{ runner.os }}-vcpkg- - name: vcpkg install run: | + echo "Vcpkg is installed at: ${{ env.VCPKG_INSTALLATION_ROOT }}" + echo "Vcpkg is installed at: ${ env.VCPKG_INSTALLATION_ROOT }" vcpkg install - name: Configure project From 6f85718b53fda4b0e738c3cb8db59a227024883e Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 11:00:43 +0300 Subject: [PATCH 09/48] - --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ede4b8..1f26f37 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,7 +57,7 @@ jobs: - name: vcpkg install run: | echo "Vcpkg is installed at: ${{ env.VCPKG_INSTALLATION_ROOT }}" - echo "Vcpkg is installed at: ${ env.VCPKG_INSTALLATION_ROOT }" + echo "Vcpkg is installed at: ${{ env.VCPKG_ROOT }}" vcpkg install - name: Configure project From 6554997d4e0b9f415af997e2463717698802c838 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 11:06:32 +0300 Subject: [PATCH 10/48] - --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1f26f37..03ceaab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,10 +46,10 @@ jobs: uses: actions/cache@v4 with: path: | + $(VCPKG_INSTALLATION_ROOT)/downloads + $(VCPKG_INSTALLATION_ROOT)/packages ${{ env.VCPKG_INSTALLATION_ROOT }}/downloads ${{ env.VCPKG_INSTALLATION_ROOT }}/packages - ${ env.VCPKG_INSTALLATION_ROOT }/downloads - ${ env.VCPKG_INSTALLATION_ROOT }/packages key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/vcpkg.json') }} restore-keys: | ${{ runner.os }}-vcpkg- @@ -58,6 +58,8 @@ jobs: run: | echo "Vcpkg is installed at: ${{ env.VCPKG_INSTALLATION_ROOT }}" echo "Vcpkg is installed at: ${{ env.VCPKG_ROOT }}" + echo "Vcpkg is installed at: ${{ VCPKG_INSTALLATION_ROOT }}" + echo "Vcpkg is installed at: ${{ VCPKG_ROOT }}" vcpkg install - name: Configure project From 3e41b2dade249723bc0e3ea198c72e2e390a5fd3 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 11:26:58 +0300 Subject: [PATCH 11/48] - --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03ceaab..4aa4c9f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,9 +46,9 @@ jobs: uses: actions/cache@v4 with: path: | - $(VCPKG_INSTALLATION_ROOT)/downloads - $(VCPKG_INSTALLATION_ROOT)/packages - ${{ env.VCPKG_INSTALLATION_ROOT }}/downloads + ${VCPKG_INSTALLATION_ROOT}/downloads + ${VCPKG_INSTALLATION_ROOT}/packages + ${{ env.VCPKG_ROOT }}/downloads ${{ env.VCPKG_INSTALLATION_ROOT }}/packages key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/vcpkg.json') }} restore-keys: | @@ -56,6 +56,7 @@ jobs: - name: vcpkg install run: | + echo "Vcpkg is installed at: ${{ env.PATH }}" echo "Vcpkg is installed at: ${{ env.VCPKG_INSTALLATION_ROOT }}" echo "Vcpkg is installed at: ${{ env.VCPKG_ROOT }}" echo "Vcpkg is installed at: ${{ VCPKG_INSTALLATION_ROOT }}" From 606171c97c1728a0bc6bb455c6a947df8bce7400 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 11:27:55 +0300 Subject: [PATCH 12/48] - --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4aa4c9f..22ffe62 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,8 +59,6 @@ jobs: echo "Vcpkg is installed at: ${{ env.PATH }}" echo "Vcpkg is installed at: ${{ env.VCPKG_INSTALLATION_ROOT }}" echo "Vcpkg is installed at: ${{ env.VCPKG_ROOT }}" - echo "Vcpkg is installed at: ${{ VCPKG_INSTALLATION_ROOT }}" - echo "Vcpkg is installed at: ${{ VCPKG_ROOT }}" vcpkg install - name: Configure project From 850c9ee55c10360baff8a577efeb64bbfa098ac8 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 11:32:10 +0300 Subject: [PATCH 13/48] - --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22ffe62..b60bc85 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,8 +46,8 @@ jobs: uses: actions/cache@v4 with: path: | - ${VCPKG_INSTALLATION_ROOT}/downloads - ${VCPKG_INSTALLATION_ROOT}/packages + ${ env.VCPKG_INSTALLATION_ROOT }/downloads + ${ env.VCPKG_INSTALLATION_ROOT }/packages ${{ env.VCPKG_ROOT }}/downloads ${{ env.VCPKG_INSTALLATION_ROOT }}/packages key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/vcpkg.json') }} @@ -59,6 +59,8 @@ jobs: echo "Vcpkg is installed at: ${{ env.PATH }}" echo "Vcpkg is installed at: ${{ env.VCPKG_INSTALLATION_ROOT }}" echo "Vcpkg is installed at: ${{ env.VCPKG_ROOT }}" + echo "Vcpkg is installed at: $(VCPKG_INSTALLATION_ROOT)" + echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" vcpkg install - name: Configure project From 0d767f76196111ae24805419b1d32745555afc0a Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 11:53:29 +0300 Subject: [PATCH 14/48] - --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b60bc85..e1f1516 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,6 +35,10 @@ jobs: - name: Env run: | + echo "Vcpkg is installed at: ${{ env.PATH }}" + echo "Vcpkg is installed at: ${{ env.ANDROID_HOME }}" + echo "Vcpkg is installed at: ${{ env.VCPKG_INSTALLATION_ROOT }}" + echo "======================" env|sort - name: Checkout From 2d4e9da15d29f79405162054e5d6f86f8bd850b5 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 11:53:53 +0300 Subject: [PATCH 15/48] - --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1f1516..6184047 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,8 +3,8 @@ run-name: Build No.${{ github.run_number }} on behalf of ${{ github.actor }} on: workflow_dispatch: - #pull_request: - # types: [opened, reopened, synchronize] + pull_request: + types: [opened, reopened, synchronize] push: branches: [main] From 8f41c14613e5b6024302137f4b345726f106693d Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 12:00:21 +0300 Subject: [PATCH 16/48] - --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6184047..0807fcf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,10 +34,14 @@ jobs: #pip3 install opencv-python pytest - name: Env + env: + VCPKG_ROOT: ${{ env.VCPKG_INSTALLATION_ROOT }} run: | echo "Vcpkg is installed at: ${{ env.PATH }}" echo "Vcpkg is installed at: ${{ env.ANDROID_HOME }}" echo "Vcpkg is installed at: ${{ env.VCPKG_INSTALLATION_ROOT }}" + echo "Vcpkg is installed at: $VCPKG_ROOT" + echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" echo "======================" env|sort From 293096b598fbc60f335588d181ba40d1a6270e7f Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 12:01:43 +0300 Subject: [PATCH 17/48] - --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0807fcf..3e8700e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: if: ${{ matrix.platform == 'linux' }} run: | gcc --version - sudo apt-get update + #sudo apt-get update - name: Install Windows Prerequisites if: ${{ matrix.platform == 'windows' }} @@ -35,7 +35,7 @@ jobs: - name: Env env: - VCPKG_ROOT: ${{ env.VCPKG_INSTALLATION_ROOT }} + VCPKG_ROOT: hello run: | echo "Vcpkg is installed at: ${{ env.PATH }}" echo "Vcpkg is installed at: ${{ env.ANDROID_HOME }}" From e5c465772c4f4abf1cd1d430952c85960cb7e88e Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 12:03:03 +0300 Subject: [PATCH 18/48] - --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e8700e..f861118 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,11 +35,8 @@ jobs: - name: Env env: - VCPKG_ROOT: hello + VCPKG_ROOT: vcpkg-root-${{ env.VCPKG_INSTALLATION_ROOT || process.env.VCPKG_INSTALLATION_ROOT }} run: | - echo "Vcpkg is installed at: ${{ env.PATH }}" - echo "Vcpkg is installed at: ${{ env.ANDROID_HOME }}" - echo "Vcpkg is installed at: ${{ env.VCPKG_INSTALLATION_ROOT }}" echo "Vcpkg is installed at: $VCPKG_ROOT" echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" echo "======================" From 623b86f5d39e967d2cf14d782b4731feef35697e Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 12:05:03 +0300 Subject: [PATCH 19/48] - --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f861118..9b78a16 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: - name: Env env: - VCPKG_ROOT: vcpkg-root-${{ env.VCPKG_INSTALLATION_ROOT || process.env.VCPKG_INSTALLATION_ROOT }} + VCPKG_ROOT: vcpkg-root-${{ env.VCPKG_INSTALLATION_ROOT }} run: | echo "Vcpkg is installed at: $VCPKG_ROOT" echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" From 8fff6a7e2f49a54c7fe972f08d4da53991a85684 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 12:17:25 +0300 Subject: [PATCH 20/48] - --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b78a16..5a6e2cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,9 +33,12 @@ jobs: run: | #pip3 install opencv-python pytest + - name: Set VCPKG_INSTALLATION_ROOT + run: echo "VCPKG_INSTALLATION_ROOT=$HOME/vcpkg" >> $GITHUB_ENV + - name: Env env: - VCPKG_ROOT: vcpkg-root-${{ env.VCPKG_INSTALLATION_ROOT }} + VCPKG_ROOT: vcpkg-root-${{ github.env.VCPKG_INSTALLATION_ROOT }} run: | echo "Vcpkg is installed at: $VCPKG_ROOT" echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" From ca80d8ec99cc191bb40918b8dae31b9ad57237c3 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 12:19:01 +0300 Subject: [PATCH 21/48] - --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a6e2cc..1469b27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,7 @@ jobs: - name: Env env: - VCPKG_ROOT: vcpkg-root-${{ github.env.VCPKG_INSTALLATION_ROOT }} + VCPKG_ROOT: vcpkg-root-${{ github.env }} run: | echo "Vcpkg is installed at: $VCPKG_ROOT" echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" From efc514fe7dc32134503496705bc3a88fac62d04f Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 12:23:46 +0300 Subject: [PATCH 22/48] - --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1469b27..a94857b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: #pip3 install opencv-python pytest - name: Set VCPKG_INSTALLATION_ROOT - run: echo "VCPKG_INSTALLATION_ROOT=$HOME/vcpkg" >> $GITHUB_ENV + run: #echo "VCPKG_INSTALLATION_ROOT=$HOME/vcpkg" >> $GITHUB_ENV - name: Env env: @@ -63,6 +63,7 @@ jobs: ${{ runner.os }}-vcpkg- - name: vcpkg install + if: steps.cache-vcpkg.outputs.cache-hit != 'true' run: | echo "Vcpkg is installed at: ${{ env.PATH }}" echo "Vcpkg is installed at: ${{ env.VCPKG_INSTALLATION_ROOT }}" From 294198e27651189281f118af7bf9fb50e774908c Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 12:26:31 +0300 Subject: [PATCH 23/48] - --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a94857b..3adde6f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,8 @@ jobs: #pip3 install opencv-python pytest - name: Set VCPKG_INSTALLATION_ROOT - run: #echo "VCPKG_INSTALLATION_ROOT=$HOME/vcpkg" >> $GITHUB_ENV + run: | + #echo "VCPKG_INSTALLATION_ROOT=$HOME/vcpkg" >> $GITHUB_ENV - name: Env env: From 51a2cf7b4a3c58b52f1f100c2f0c98f87cd01672 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 12:32:21 +0300 Subject: [PATCH 24/48] - --- .github/workflows/build.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3adde6f..22434a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,6 +12,9 @@ jobs: build: + env: + VCPKG_INSTALLATION_ROOT: ${{ github.workspace }}/vcpkg + runs-on: ${{ matrix.os }} strategy: matrix: @@ -33,9 +36,16 @@ jobs: run: | #pip3 install opencv-python pytest + - name: Install vcpkg + run: | + echo "Installing vcpkg" + git clone git@github.com:microsoft/vcpkg.git + cd vcpkg + ./bootstrap-vcpkg.sh --disableMetrics + - name: Set VCPKG_INSTALLATION_ROOT run: | - #echo "VCPKG_INSTALLATION_ROOT=$HOME/vcpkg" >> $GITHUB_ENV + echo "VCPKG_INSTALLATION_ROOT=${{ env.VCPKG_INSTALLATION_ROOT }}" >> $GITHUB_ENV - name: Env env: From 8712843e0076080434591e1ac18383d78f1af665 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 12:33:42 +0300 Subject: [PATCH 25/48] - --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22434a6..4af000a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,8 @@ jobs: - name: Install vcpkg run: | echo "Installing vcpkg" - git clone git@github.com:microsoft/vcpkg.git + git clone https://github.com/microsoft/vcpkg.git + pwd cd vcpkg ./bootstrap-vcpkg.sh --disableMetrics From d7ac5c7848ed0af89b973ee8375c657b5a9361cf Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 12:41:21 +0300 Subject: [PATCH 26/48] - --- .github/workflows/build.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4af000a..9516e1f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,12 +47,12 @@ jobs: - name: Set VCPKG_INSTALLATION_ROOT run: | echo "VCPKG_INSTALLATION_ROOT=${{ env.VCPKG_INSTALLATION_ROOT }}" >> $GITHUB_ENV + echo "PATH=${{ env.VCPKG_INSTALLATION_ROOT }}:$PATH" >> $GITHUB_ENV - name: Env env: VCPKG_ROOT: vcpkg-root-${{ github.env }} run: | - echo "Vcpkg is installed at: $VCPKG_ROOT" echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" echo "======================" env|sort @@ -66,10 +66,8 @@ jobs: uses: actions/cache@v4 with: path: | - ${ env.VCPKG_INSTALLATION_ROOT }/downloads - ${ env.VCPKG_INSTALLATION_ROOT }/packages - ${{ env.VCPKG_ROOT }}/downloads ${{ env.VCPKG_INSTALLATION_ROOT }}/packages + ${{ env.VCPKG_INSTALLATION_ROOT }}/downloads key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/vcpkg.json') }} restore-keys: | ${{ runner.os }}-vcpkg- From 13369cd60af984586582601bb27c458c057d3871 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 12:46:45 +0300 Subject: [PATCH 27/48] - --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9516e1f..25b528e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,6 +48,7 @@ jobs: run: | echo "VCPKG_INSTALLATION_ROOT=${{ env.VCPKG_INSTALLATION_ROOT }}" >> $GITHUB_ENV echo "PATH=${{ env.VCPKG_INSTALLATION_ROOT }}:$PATH" >> $GITHUB_ENV + which vcpkg - name: Env env: @@ -75,10 +76,9 @@ jobs: - name: vcpkg install if: steps.cache-vcpkg.outputs.cache-hit != 'true' run: | + which vcpkg echo "Vcpkg is installed at: ${{ env.PATH }}" echo "Vcpkg is installed at: ${{ env.VCPKG_INSTALLATION_ROOT }}" - echo "Vcpkg is installed at: ${{ env.VCPKG_ROOT }}" - echo "Vcpkg is installed at: $(VCPKG_INSTALLATION_ROOT)" echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" vcpkg install From 9163db85764ab06a776c7ee211d4dcc7ce9d0b86 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 12:51:41 +0300 Subject: [PATCH 28/48] Update build.yml --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 25b528e..b4736c3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,11 +76,10 @@ jobs: - name: vcpkg install if: steps.cache-vcpkg.outputs.cache-hit != 'true' run: | - which vcpkg - echo "Vcpkg is installed at: ${{ env.PATH }}" + echo "PATH is: ${{ env.PATH }}" echo "Vcpkg is installed at: ${{ env.VCPKG_INSTALLATION_ROOT }}" echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" - vcpkg install + $VCPKG_INSTALLATION_ROOT/vcpkg install - name: Configure project run: | From 5aa18c70418ace31062e1b665ee4b56206a9497b Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 12:53:44 +0300 Subject: [PATCH 29/48] -- --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b4736c3..0869ff1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,8 +51,6 @@ jobs: which vcpkg - name: Env - env: - VCPKG_ROOT: vcpkg-root-${{ github.env }} run: | echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" echo "======================" From 90bde9e75a1484049643ecb86ac03dd00ac1337f Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 12:58:45 +0300 Subject: [PATCH 30/48] - --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0869ff1..6aa7310 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,6 +43,7 @@ jobs: pwd cd vcpkg ./bootstrap-vcpkg.sh --disableMetrics + ls - name: Set VCPKG_INSTALLATION_ROOT run: | From 3153b02f92b5d89978abae8c918ef59c23e43903 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:01:31 +0300 Subject: [PATCH 31/48] - --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6aa7310..f746157 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,9 +40,9 @@ jobs: run: | echo "Installing vcpkg" git clone https://github.com/microsoft/vcpkg.git - pwd cd vcpkg ./bootstrap-vcpkg.sh --disableMetrics + pwd ls - name: Set VCPKG_INSTALLATION_ROOT @@ -78,6 +78,7 @@ jobs: echo "PATH is: ${{ env.PATH }}" echo "Vcpkg is installed at: ${{ env.VCPKG_INSTALLATION_ROOT }}" echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" + pwd $VCPKG_INSTALLATION_ROOT/vcpkg install - name: Configure project From e0f46cf701b5ba1f69b1024a71aee47902156004 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:03:37 +0300 Subject: [PATCH 32/48] - --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f746157..051dc54 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,6 +45,9 @@ jobs: pwd ls + - name: Checkout + uses: actions/checkout@v4 + - name: Set VCPKG_INSTALLATION_ROOT run: | echo "VCPKG_INSTALLATION_ROOT=${{ env.VCPKG_INSTALLATION_ROOT }}" >> $GITHUB_ENV @@ -57,9 +60,6 @@ jobs: echo "======================" env|sort - - name: Checkout - uses: actions/checkout@v4 - # Cache vcpkg - name: Cache vcpkg id: cache-vcpkg From 893323f49287d66e5ebea44950282167b25a8da4 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:04:25 +0300 Subject: [PATCH 33/48] - --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 051dc54..8319f15 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,6 +36,9 @@ jobs: run: | #pip3 install opencv-python pytest + - name: Checkout + uses: actions/checkout@v4 + - name: Install vcpkg run: | echo "Installing vcpkg" @@ -45,9 +48,6 @@ jobs: pwd ls - - name: Checkout - uses: actions/checkout@v4 - - name: Set VCPKG_INSTALLATION_ROOT run: | echo "VCPKG_INSTALLATION_ROOT=${{ env.VCPKG_INSTALLATION_ROOT }}" >> $GITHUB_ENV From eb64ac2f43cd497e11b69d92e0ebff3731fe1fc0 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:05:59 +0300 Subject: [PATCH 34/48] - --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8319f15..e8ba3c5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,8 +45,6 @@ jobs: git clone https://github.com/microsoft/vcpkg.git cd vcpkg ./bootstrap-vcpkg.sh --disableMetrics - pwd - ls - name: Set VCPKG_INSTALLATION_ROOT run: | From a72a4ac0bb0bb51c37713ba28654443ea7341da6 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:11:09 +0300 Subject: [PATCH 35/48] - --- .github/workflows/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e8ba3c5..a95db36 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,10 +71,13 @@ jobs: ${{ runner.os }}-vcpkg- - name: vcpkg install - if: steps.cache-vcpkg.outputs.cache-hit != 'true' + #if: steps.cache-vcpkg.outputs.cache-hit != 'true' run: | + echo "=======================" echo "PATH is: ${{ env.PATH }}" - echo "Vcpkg is installed at: ${{ env.VCPKG_INSTALLATION_ROOT }}" + echo "=======================" + which vcpkg + echo "=======================" echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" pwd $VCPKG_INSTALLATION_ROOT/vcpkg install From 94e707e4204587868903ab87ca339c2e77f6a567 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:12:33 +0300 Subject: [PATCH 36/48] - --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a95db36..fabdfff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,7 @@ jobs: #if: steps.cache-vcpkg.outputs.cache-hit != 'true' run: | echo "=======================" - echo "PATH is: ${{ env.PATH }}" + echo "PATH is: $PATH" echo "=======================" which vcpkg echo "=======================" From 8da5c63f9e913fd634b0eb283983b645b8e336ad Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:14:23 +0300 Subject: [PATCH 37/48] - --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fabdfff..a4d93a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,7 +71,7 @@ jobs: ${{ runner.os }}-vcpkg- - name: vcpkg install - #if: steps.cache-vcpkg.outputs.cache-hit != 'true' + if: steps.cache-vcpkg.outputs.cache-hit != 'true' run: | echo "=======================" echo "PATH is: $PATH" From 4c17e24b3330e501a6b309ebd71dbcdb22014d37 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:16:29 +0300 Subject: [PATCH 38/48] - --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a4d93a8..868796d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,8 +73,6 @@ jobs: - name: vcpkg install if: steps.cache-vcpkg.outputs.cache-hit != 'true' run: | - echo "=======================" - echo "PATH is: $PATH" echo "=======================" which vcpkg echo "=======================" From 8b39d72f7c0b542149946065021287aba469f054 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:22:46 +0300 Subject: [PATCH 39/48] - --- .github/workflows/build.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 868796d..45d5dac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,16 +42,16 @@ jobs: - name: Install vcpkg run: | echo "Installing vcpkg" - git clone https://github.com/microsoft/vcpkg.git - cd vcpkg - ./bootstrap-vcpkg.sh --disableMetrics - - name: Set VCPKG_INSTALLATION_ROOT - run: | echo "VCPKG_INSTALLATION_ROOT=${{ env.VCPKG_INSTALLATION_ROOT }}" >> $GITHUB_ENV echo "PATH=${{ env.VCPKG_INSTALLATION_ROOT }}:$PATH" >> $GITHUB_ENV + echo "VCPKG_DEFAULT_BINARY_CACHE=${{ env.VCPKG_INSTALLATION_ROOT }}/.cache" >> $GITHUB_ENV which vcpkg + git clone https://github.com/microsoft/vcpkg.git + cd vcpkg + ./bootstrap-vcpkg.sh --disableMetrics + - name: Env run: | echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" @@ -64,19 +64,21 @@ jobs: uses: actions/cache@v4 with: path: | - ${{ env.VCPKG_INSTALLATION_ROOT }}/packages - ${{ env.VCPKG_INSTALLATION_ROOT }}/downloads + ${{ env.VCPKG_INSTALLATION_ROOT }}/.cache + # ${{ env.VCPKG_INSTALLATION_ROOT }}/packages + # ${{ env.VCPKG_INSTALLATION_ROOT }}/downloads key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/vcpkg.json') }} restore-keys: | ${{ runner.os }}-vcpkg- - name: vcpkg install - if: steps.cache-vcpkg.outputs.cache-hit != 'true' + #if: steps.cache-vcpkg.outputs.cache-hit != 'true' run: | echo "=======================" which vcpkg echo "=======================" echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" + echo "VCPKG_DEFAULT_BINARY_CACHE is: $VCPKG_DEFAULT_BINARY_CACHE" pwd $VCPKG_INSTALLATION_ROOT/vcpkg install From f2e8e9f4be6b0bb8a93932712f691bc84a35f706 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:25:05 +0300 Subject: [PATCH 40/48] - --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 45d5dac..cccd15d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,6 +51,7 @@ jobs: git clone https://github.com/microsoft/vcpkg.git cd vcpkg ./bootstrap-vcpkg.sh --disableMetrics + mkdir ${{ env.VCPKG_INSTALLATION_ROOT }}/.cache - name: Env run: | From 2719855c150cc0e8d1a8c6fe6e47ad30d76a9476 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:26:34 +0300 Subject: [PATCH 41/48] - --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cccd15d..892bb96 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,7 +57,7 @@ jobs: run: | echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" echo "======================" - env|sort + #env|sort # Cache vcpkg - name: Cache vcpkg From 0cced095774f76ead8cfd9488d19027ecc751ee5 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:29:48 +0300 Subject: [PATCH 42/48] - --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 892bb96..c664df9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,8 +66,6 @@ jobs: with: path: | ${{ env.VCPKG_INSTALLATION_ROOT }}/.cache - # ${{ env.VCPKG_INSTALLATION_ROOT }}/packages - # ${{ env.VCPKG_INSTALLATION_ROOT }}/downloads key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/vcpkg.json') }} restore-keys: | ${{ runner.os }}-vcpkg- From 9eaadea28c9a5dc1fde25b57a34576337b3d448d Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:31:04 +0300 Subject: [PATCH 43/48] - --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c664df9..3eaf911 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,7 +56,7 @@ jobs: - name: Env run: | echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" - echo "======================" + #echo "======================" #env|sort # Cache vcpkg From 4cb42a4e3b8a1d4eb6f8c24c61353e004be2071e Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:32:32 +0300 Subject: [PATCH 44/48] - --- .github/workflows/build.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3eaf911..d6f29d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -70,17 +70,6 @@ jobs: restore-keys: | ${{ runner.os }}-vcpkg- - - name: vcpkg install - #if: steps.cache-vcpkg.outputs.cache-hit != 'true' - run: | - echo "=======================" - which vcpkg - echo "=======================" - echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" - echo "VCPKG_DEFAULT_BINARY_CACHE is: $VCPKG_DEFAULT_BINARY_CACHE" - pwd - $VCPKG_INSTALLATION_ROOT/vcpkg install - - name: Configure project run: | cmake --preset=${{ matrix.platform }}-rel -S ./ -B ./build From 9d613f765c425321c0d571d40237c96e7c93d18a Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:42:35 +0300 Subject: [PATCH 45/48] - --- .github/actions/vcpkg-cache/action.yml | 39 ++++++++++++++++++++++++++ .github/workflows/build.yml | 33 +++------------------- 2 files changed, 43 insertions(+), 29 deletions(-) create mode 100644 .github/actions/vcpkg-cache/action.yml diff --git a/.github/actions/vcpkg-cache/action.yml b/.github/actions/vcpkg-cache/action.yml new file mode 100644 index 0000000..488cc21 --- /dev/null +++ b/.github/actions/vcpkg-cache/action.yml @@ -0,0 +1,39 @@ +name: 'Setup vcpkg cache' +inputs: + vcpkg-root-path: + description: 'Path where to install vcpkg' + required: true + type: string +runs: + using: "composite" + steps: + - name: Install vcpkg + run: | + echo "Installing vcpkg" + + echo "VCPKG_INSTALLATION_ROOT=${{ inputs.vcpkg-root-path }}" >> $GITHUB_ENV + echo "PATH=${{ inputs.vcpkg-root-path }}:$PATH" >> $GITHUB_ENV + echo "VCPKG_DEFAULT_BINARY_CACHE=${{ inputs.vcpkg-root-path }}/.cache" >> $GITHUB_ENV + which vcpkg + + git clone https://github.com/microsoft/vcpkg.git + cd vcpkg + ./bootstrap-vcpkg.sh --disableMetrics + mkdir ${{ inputs.vcpkg-root-path }}/.cache + + - name: Env + run: | + echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" + #echo "======================" + #env|sort + + # Cache vcpkg + - name: Cache vcpkg + id: cache-vcpkg + uses: actions/cache@v4 + with: + path: | + ${{ inputs.vcpkg-root-path }}/.cache + key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/vcpkg.json') }} + restore-keys: | + ${{ runner.os }}-vcpkg- diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d6f29d1..29bb95c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,36 +39,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Install vcpkg - run: | - echo "Installing vcpkg" - - echo "VCPKG_INSTALLATION_ROOT=${{ env.VCPKG_INSTALLATION_ROOT }}" >> $GITHUB_ENV - echo "PATH=${{ env.VCPKG_INSTALLATION_ROOT }}:$PATH" >> $GITHUB_ENV - echo "VCPKG_DEFAULT_BINARY_CACHE=${{ env.VCPKG_INSTALLATION_ROOT }}/.cache" >> $GITHUB_ENV - which vcpkg - - git clone https://github.com/microsoft/vcpkg.git - cd vcpkg - ./bootstrap-vcpkg.sh --disableMetrics - mkdir ${{ env.VCPKG_INSTALLATION_ROOT }}/.cache - - - name: Env - run: | - echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" - #echo "======================" - #env|sort - - # Cache vcpkg - - name: Cache vcpkg - id: cache-vcpkg - uses: actions/cache@v4 + - name: Setup cache + uses: ./.github/actions/vcpkg-cache with: - path: | - ${{ env.VCPKG_INSTALLATION_ROOT }}/.cache - key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/vcpkg.json') }} - restore-keys: | - ${{ runner.os }}-vcpkg- + vcpkg-root-path: ${{ env.VCPKG_INSTALLATION_ROOT }} + - name: Configure project run: | From e2a7b40636167f5d171ba7116b377d25660c5eb2 Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:45:11 +0300 Subject: [PATCH 46/48] - --- .github/actions/vcpkg-cache/action.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/actions/vcpkg-cache/action.yml b/.github/actions/vcpkg-cache/action.yml index 488cc21..b857df1 100644 --- a/.github/actions/vcpkg-cache/action.yml +++ b/.github/actions/vcpkg-cache/action.yml @@ -8,6 +8,7 @@ runs: using: "composite" steps: - name: Install vcpkg + shell: bash run: | echo "Installing vcpkg" @@ -22,6 +23,7 @@ runs: mkdir ${{ inputs.vcpkg-root-path }}/.cache - name: Env + shell: bash run: | echo "Vcpkg is installed at: $VCPKG_INSTALLATION_ROOT" #echo "======================" @@ -29,6 +31,7 @@ runs: # Cache vcpkg - name: Cache vcpkg + shell: bash id: cache-vcpkg uses: actions/cache@v4 with: From 6924a95ee28b3c62f64a2154a447135061fc4acb Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:47:12 +0300 Subject: [PATCH 47/48] - --- .github/actions/vcpkg-cache/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/vcpkg-cache/action.yml b/.github/actions/vcpkg-cache/action.yml index b857df1..2134f9c 100644 --- a/.github/actions/vcpkg-cache/action.yml +++ b/.github/actions/vcpkg-cache/action.yml @@ -31,7 +31,6 @@ runs: # Cache vcpkg - name: Cache vcpkg - shell: bash id: cache-vcpkg uses: actions/cache@v4 with: From 557785a401bbb3c2d60269a1e6328d018cf90eae Mon Sep 17 00:00:00 2001 From: rukhov Date: Thu, 29 May 2025 13:48:54 +0300 Subject: [PATCH 48/48] - --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 29bb95c..0ef0407 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,7 +44,6 @@ jobs: with: vcpkg-root-path: ${{ env.VCPKG_INSTALLATION_ROOT }} - - name: Configure project run: | cmake --preset=${{ matrix.platform }}-rel -S ./ -B ./build