From 417c7d64df827bce8711e6a3345a3d10f515b56a Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Mon, 27 Jan 2025 12:08:21 -0800 Subject: [PATCH 1/7] Add bad baseline --- versions/baseline.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/versions/baseline.json b/versions/baseline.json index 0576a06e..0de2af24 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8,5 +8,11 @@ "baseline": "1.0.1", "port-version": 0 } + }, + "extra": { + "beison": { + "baseline": "1.0.0", + "port-version": 0 + } } } From 503890df7509a0e5d5d02974792ad192e927da92 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Wed, 14 May 2025 10:01:35 -0700 Subject: [PATCH 2/7] Use actions/cache --- .github/workflows/test-registry-ports.yml | 52 +++++++++++++---------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/.github/workflows/test-registry-ports.yml b/.github/workflows/test-registry-ports.yml index 87a7c579..177bcce6 100644 --- a/.github/workflows/test-registry-ports.yml +++ b/.github/workflows/test-registry-ports.yml @@ -7,33 +7,39 @@ on: branches: ["vcpkg-registry"] env: - VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" VCPKG_OVERLAY_PORTS: "${{ github.workspace }}/ports" + VCPKG_TARGET_TRIPLET: "x64-linux" jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - - name: Acquire vcpkg - uses: actions/checkout@v4 - with: - repository: "Microsoft/vcpkg" - path: vcpkg - - - name: Bootstrap vcpkg - run: "${{ github.workspace }}/vcpkg/bootstrap-vcpkg.sh" - shell: bash - - - name: Enable GitHub Actions Cache backend - uses: actions/github-script@v7 - with: - script: | - core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); - core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); - - - name: Build ports - run: ${{ github.workspace }}/vcpkg/vcpkg install - shell: bash + - uses: actions/checkout@v4 + + - name: Acquire vcpkg + uses: actions/checkout@v4 + with: + repository: "Microsoft/vcpkg" + path: vcpkg + + - name: Bootstrap vcpkg + run: "${{ github.workspace }}/vcpkg/bootstrap-vcpkg.sh" + shell: bash + + - name: Cache vcpkg dependencies + uses: actions/cache@v4 + env: + cache-name: cache-vcpkg + manifest-path: "${{ github.workspace }}/vcpkg.json" + toolchain-path: "${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" + with: + path: ${{ github.workspace }}/vcpkg_installed + key: ${{ env.cache-name }}-${{ env.VCPKG_TARGET_TRIPLET }}-${{ hashFiles('${{ env.toolchain-path }}')}}-${{ hashFiles('${{ env.manifest-path }}') }} + restore-keys: | + ${{ env.cache-name }}-${{ env.VCPKG_TARGET_TRIPLET }}-${{ hashFiles('${{ env.toolchain-path }}')}}- + ${{ env.cache-name }}-${{ env.VCPKG_TARGET_TRIPLET }}- + + - name: Build ports + run: ${{ github.workspace }}/vcpkg/vcpkg install + shell: bash From c8a933c6a561fe176e493a96690de93e735bd926 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Wed, 14 May 2025 10:07:48 -0700 Subject: [PATCH 3/7] Remove bad baseline entry --- .github/workflows/test-registry-ports.yml | 4 ++-- versions/baseline.json | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-registry-ports.yml b/.github/workflows/test-registry-ports.yml index 177bcce6..ca4fbbce 100644 --- a/.github/workflows/test-registry-ports.yml +++ b/.github/workflows/test-registry-ports.yml @@ -35,9 +35,9 @@ jobs: toolchain-path: "${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" with: path: ${{ github.workspace }}/vcpkg_installed - key: ${{ env.cache-name }}-${{ env.VCPKG_TARGET_TRIPLET }}-${{ hashFiles('${{ env.toolchain-path }}')}}-${{ hashFiles('${{ env.manifest-path }}') }} + key: ${{ env.cache-name }}-${{ env.VCPKG_TARGET_TRIPLET }}-${{ hashFiles(${{ env.toolchain-path }}) }}-${{ hashFiles(${{ env.manifest-path }}) }} restore-keys: | - ${{ env.cache-name }}-${{ env.VCPKG_TARGET_TRIPLET }}-${{ hashFiles('${{ env.toolchain-path }}')}}- + ${{ env.cache-name }}-${{ env.VCPKG_TARGET_TRIPLET }}-${{ hashFiles(${{ env.toolchain-path }}) }}- ${{ env.cache-name }}-${{ env.VCPKG_TARGET_TRIPLET }}- - name: Build ports diff --git a/versions/baseline.json b/versions/baseline.json index 0de2af24..0576a06e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8,11 +8,5 @@ "baseline": "1.0.1", "port-version": 0 } - }, - "extra": { - "beison": { - "baseline": "1.0.0", - "port-version": 0 - } } } From efc265a2ed19ad11025e8efd66fc30a1eb8a9580 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Wed, 14 May 2025 10:15:48 -0700 Subject: [PATCH 4/7] Use relative paths --- .github/workflows/test-registry-ports.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-registry-ports.yml b/.github/workflows/test-registry-ports.yml index ca4fbbce..94390a52 100644 --- a/.github/workflows/test-registry-ports.yml +++ b/.github/workflows/test-registry-ports.yml @@ -29,16 +29,12 @@ jobs: - name: Cache vcpkg dependencies uses: actions/cache@v4 - env: - cache-name: cache-vcpkg - manifest-path: "${{ github.workspace }}/vcpkg.json" - toolchain-path: "${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake" with: path: ${{ github.workspace }}/vcpkg_installed - key: ${{ env.cache-name }}-${{ env.VCPKG_TARGET_TRIPLET }}-${{ hashFiles(${{ env.toolchain-path }}) }}-${{ hashFiles(${{ env.manifest-path }}) }} + key: cache-vcpkg-${{ env.VCPKG_TARGET_TRIPLET }}-${{ hashFiles('/vcpkg/scripts/buildsystems/vcpkg.cmake') }}-${{ hashFiles('/vcpkg.json') }} restore-keys: | - ${{ env.cache-name }}-${{ env.VCPKG_TARGET_TRIPLET }}-${{ hashFiles(${{ env.toolchain-path }}) }}- - ${{ env.cache-name }}-${{ env.VCPKG_TARGET_TRIPLET }}- + cache-vcpkg-${{ env.VCPKG_TARGET_TRIPLET }}-${{ hashFiles('/vcpkg/scripts/buildsystems/vcpkg.cmake') }}- + cache-vcpkg-${{ env.VCPKG_TARGET_TRIPLET }}- - name: Build ports run: ${{ github.workspace }}/vcpkg/vcpkg install From d78c6485d1bc48f534ecd6156014d5422544d469 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Wed, 14 May 2025 10:19:47 -0700 Subject: [PATCH 5/7] Use good baseline --- .github/workflows/test-registry-ports.yml | 6 ++++++ vcpkg.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-registry-ports.yml b/.github/workflows/test-registry-ports.yml index 94390a52..54dbe0f2 100644 --- a/.github/workflows/test-registry-ports.yml +++ b/.github/workflows/test-registry-ports.yml @@ -27,6 +27,12 @@ jobs: run: "${{ github.workspace }}/vcpkg/bootstrap-vcpkg.sh" shell: bash + - name: Test keys + run: | + echo "${{ hashFiles('vcpkg/scripts/buildsystems/vcpkg.cmake') }}" + echo "${{ hashFiles('vcpkg.json') }}" + shell: bash + - name: Cache vcpkg dependencies uses: actions/cache@v4 with: diff --git a/vcpkg.json b/vcpkg.json index 88870dbb..d5be3b54 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -4,5 +4,5 @@ "beicode", "beison" ], - "builtin-baseline": "821100d967e1737d96414a308e3f7cbe0d1abf18" + "builtin-baseline": "768f6a3ad9f9b6c4c2ff390137690cf26e3c3453" } From f984191be6766cec9d1312b34ad9204767e5a9ac Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Wed, 14 May 2025 10:22:09 -0700 Subject: [PATCH 6/7] Use good baseline --- .github/workflows/test-registry-ports.yml | 4 ++-- vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-registry-ports.yml b/.github/workflows/test-registry-ports.yml index 54dbe0f2..e1b85300 100644 --- a/.github/workflows/test-registry-ports.yml +++ b/.github/workflows/test-registry-ports.yml @@ -37,9 +37,9 @@ jobs: uses: actions/cache@v4 with: path: ${{ github.workspace }}/vcpkg_installed - key: cache-vcpkg-${{ env.VCPKG_TARGET_TRIPLET }}-${{ hashFiles('/vcpkg/scripts/buildsystems/vcpkg.cmake') }}-${{ hashFiles('/vcpkg.json') }} + key: cache-vcpkg-${{ env.VCPKG_TARGET_TRIPLET }}-${{ hashFiles('vcpkg/scripts/buildsystems/vcpkg.cmake') }}-${{ hashFiles('vcpkg.json') }} restore-keys: | - cache-vcpkg-${{ env.VCPKG_TARGET_TRIPLET }}-${{ hashFiles('/vcpkg/scripts/buildsystems/vcpkg.cmake') }}- + cache-vcpkg-${{ env.VCPKG_TARGET_TRIPLET }}-${{ hashFiles('vcpkg/scripts/buildsystems/vcpkg.cmake') }}- cache-vcpkg-${{ env.VCPKG_TARGET_TRIPLET }}- - name: Build ports diff --git a/vcpkg.json b/vcpkg.json index d5be3b54..f848e24a 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -4,5 +4,5 @@ "beicode", "beison" ], - "builtin-baseline": "768f6a3ad9f9b6c4c2ff390137690cf26e3c3453" + "builtin-baseline": "dbe35ceb30c688bf72e952ab23778e009a578f18" } From 82581e18338a76a5aab0e6c7d8316609a88b19e1 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Wed, 14 May 2025 10:25:48 -0700 Subject: [PATCH 7/7] Add new dep --- .github/workflows/test-registry-ports.yml | 1 + vcpkg.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-registry-ports.yml b/.github/workflows/test-registry-ports.yml index e1b85300..2adeadc2 100644 --- a/.github/workflows/test-registry-ports.yml +++ b/.github/workflows/test-registry-ports.yml @@ -22,6 +22,7 @@ jobs: with: repository: "Microsoft/vcpkg" path: vcpkg + fetch-depth: 0 - name: Bootstrap vcpkg run: "${{ github.workspace }}/vcpkg/bootstrap-vcpkg.sh" diff --git a/vcpkg.json b/vcpkg.json index f848e24a..3522eb22 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -2,7 +2,8 @@ "$comment": "The dependency list should be populated with every port in the registry", "dependencies": [ "beicode", - "beison" + "beison", + "zlib" ], "builtin-baseline": "dbe35ceb30c688bf72e952ab23778e009a578f18" }