diff --git a/.github/workflows/test-registry-ports.yml b/.github/workflows/test-registry-ports.yml index 87a7c579..2adeadc2 100644 --- a/.github/workflows/test-registry-ports.yml +++ b/.github/workflows/test-registry-ports.yml @@ -7,33 +7,42 @@ 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 + fetch-depth: 0 + + - name: Bootstrap vcpkg + 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: + path: ${{ github.workspace }}/vcpkg_installed + 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 }}- + + - name: Build ports + run: ${{ github.workspace }}/vcpkg/vcpkg install + shell: bash diff --git a/vcpkg.json b/vcpkg.json index 88870dbb..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": "821100d967e1737d96414a308e3f7cbe0d1abf18" + "builtin-baseline": "dbe35ceb30c688bf72e952ab23778e009a578f18" }