CI: Create and use a GitHub Actions cache for vcpkg

This commit is contained in:
Andrew Kaster
2024-06-06 14:55:14 -06:00
committed by Tim Flynn
parent 62b016002a
commit bffdd280bf
5 changed files with 53 additions and 24 deletions

View File

@@ -91,3 +91,10 @@ runs:
key: UnicodeLocale-${{ hashFiles('Meta/CMake/locale_data.cmake') }}-${{ steps.date-stamp.outputs.timestamp }} key: UnicodeLocale-${{ hashFiles('Meta/CMake/locale_data.cmake') }}-${{ steps.date-stamp.outputs.timestamp }}
restore-keys: | restore-keys: |
UnicodeLocale-${{ hashFiles('Meta/CMake/locale_data.cmake') }} UnicodeLocale-${{ hashFiles('Meta/CMake/locale_data.cmake') }}
- name: Export vcpkg GitHub Actions cache environment variables
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 || '');

View File

@@ -23,6 +23,7 @@ env:
LADYBIRD_SOURCE_DIR: ${{ github.workspace }} LADYBIRD_SOURCE_DIR: ${{ github.workspace }}
CCACHE_DIR: ${{ github.workspace }}/.ccache CCACHE_DIR: ${{ github.workspace }}/.ccache
VCPKG_ROOT: ${{ github.workspace }}/Toolchain/Tarballs/vcpkg VCPKG_ROOT: ${{ github.workspace }}/Toolchain/Tarballs/vcpkg
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
jobs: jobs:
CI: CI:
@@ -84,13 +85,9 @@ jobs:
if: ${{ inputs.fuzzer == 'NO_FUZZ' }} if: ${{ inputs.fuzzer == 'NO_FUZZ' }}
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: | run: |
cmake -GNinja -B Build \ cmake --preset Sanitizer_CI -B Build \
-DBUILD_LAGOM=ON \
-DINCLUDE_WASM_SPEC_TESTS=ON \ -DINCLUDE_WASM_SPEC_TESTS=ON \
-DWASM_SPEC_TEST_SKIP_FORMATTING=ON \ -DWASM_SPEC_TEST_SKIP_FORMATTING=ON \
-DENABLE_UNDEFINED_SANITIZER=ON \
-DENABLE_ADDRESS_SANITIZER=ON \
-DSERENITY_CACHE_DIR=${{ github.workspace }}/Build/caches \
-DCMAKE_C_COMPILER=${{ steps.build-parameters.outputs.host_cc }} \ -DCMAKE_C_COMPILER=${{ steps.build-parameters.outputs.host_cc }} \
-DCMAKE_CXX_COMPILER=${{ steps.build-parameters.outputs.host_cxx }} -DCMAKE_CXX_COMPILER=${{ steps.build-parameters.outputs.host_cxx }}
@@ -110,11 +107,7 @@ jobs:
ninja -C tools-build install ninja -C tools-build install
cmake -GNinja -S Meta/Lagom -B Build \ cmake --preset Fuzzers_CI -B Build \
-DBUILD_LAGOM=ON \
-DENABLE_FUZZERS_LIBFUZZER=ON \
-DENABLE_ADDRESS_SANITIZER=ON \
-DSERENITY_CACHE_DIR=${{ github.workspace }}/Build/caches \
-DCMAKE_C_COMPILER=${{ steps.build-parameters.outputs.host_cc }} \ -DCMAKE_C_COMPILER=${{ steps.build-parameters.outputs.host_cc }} \
-DCMAKE_CXX_COMPILER=${{ steps.build-parameters.outputs.host_cxx }} \ -DCMAKE_CXX_COMPILER=${{ steps.build-parameters.outputs.host_cxx }} \
-DCMAKE_PREFIX_PATH=${{ github.workspace }}/tool-install -DCMAKE_PREFIX_PATH=${{ github.workspace }}/tool-install
@@ -149,12 +142,9 @@ jobs:
- name: Test - name: Test
if: ${{ inputs.fuzzer == 'NO_FUZZ' }} if: ${{ inputs.fuzzer == 'NO_FUZZ' }}
working-directory: ${{ github.workspace }}/Build working-directory: ${{ github.workspace }}
run: ninja test run: ctest --preset Sanitizer --output-on-failure --test-dir Build
env: env:
CTEST_OUTPUT_ON_FAILURE: 1
ASAN_OPTIONS: 'strict_string_checks=1:check_initialization_order=1:strict_init_order=1:detect_stack_use_after_return=1:allocator_may_return_null=1'
UBSAN_OPTIONS: 'print_stacktrace=1:print_summary=1:halt_on_error=1'
TESTS_ONLY: 1 TESTS_ONLY: 1
- name: Upload LibWeb Test Artifacts - name: Upload LibWeb Test Artifacts

View File

@@ -11,6 +11,7 @@ env:
LADYBIRD_SOURCE_DIR: ${{ github.workspace }} LADYBIRD_SOURCE_DIR: ${{ github.workspace }}
CCACHE_DIR: ${{ github.workspace }}/.ccache CCACHE_DIR: ${{ github.workspace }}/.ccache
VCPKG_ROOT: ${{ github.workspace }}/Toolchain/Tarballs/vcpkg VCPKG_ROOT: ${{ github.workspace }}/Toolchain/Tarballs/vcpkg
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
concurrency: concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || format('{0}-{1}', github.ref, github.run_number) }} group: ${{ github.workflow }}-${{ github.head_ref || format('{0}-{1}', github.ref, github.run_number) }}

View File

@@ -6,6 +6,7 @@ env:
LADYBIRD_SOURCE_DIR: ${{ github.workspace }} LADYBIRD_SOURCE_DIR: ${{ github.workspace }}
SERENITY_CCACHE_DIR: ${{ github.workspace }}/.ccache SERENITY_CCACHE_DIR: ${{ github.workspace }}/.ccache
VCPKG_ROOT: ${{ github.workspace }}/Toolchain/Tarballs/vcpkg VCPKG_ROOT: ${{ github.workspace }}/Toolchain/Tarballs/vcpkg
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
jobs: jobs:
build-and-package: build-and-package:
@@ -48,11 +49,9 @@ jobs:
- name: Create build directory Ubuntu - name: Create build directory Ubuntu
run: | run: |
cmake -S Meta/Lagom -B Build -G Ninja \ cmake --preset CI -B Build \
-DCMAKE_C_COMPILER=gcc-13 \ -DCMAKE_C_COMPILER=gcc-13
-DCMAKE_CXX_COMPILER=g++-13 \ -DCMAKE_CXX_COMPILER=g++-13
-DBUILD_LAGOM=ON \
-DSERENITY_CACHE_DIR=${{ github.workspace }}/Build/caches
if: ${{ matrix.os == 'ubuntu-22.04' }} if: ${{ matrix.os == 'ubuntu-22.04' }}
env: env:
CCACHE_DIR: ${{ env.SERENITY_CCACHE_DIR }} CCACHE_DIR: ${{ env.SERENITY_CCACHE_DIR }}
@@ -60,12 +59,10 @@ jobs:
- name: Create build directory macOS - name: Create build directory macOS
run: | run: |
# Note: We are using Apple Clang to create Universal binary # Note: We are using Apple Clang to create Universal binary
cmake -S Meta/Lagom -B Build -G Ninja \ cmake --preset CI -B Build \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \ -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
-DCMAKE_OSX_DEPLOYMENT_TARGET="11.0" \ -DCMAKE_OSX_DEPLOYMENT_TARGET="11.0"
-DBUILD_LAGOM=ON \
-DSERENITY_CACHE_DIR=${{ github.workspace }}/Build/caches
if: ${{ matrix.os == 'macos-14' }} if: ${{ matrix.os == 'macos-14' }}
env: env:
CCACHE_DIR: ${{ env.SERENITY_CCACHE_DIR }} CCACHE_DIR: ${{ env.SERENITY_CCACHE_DIR }}

View File

@@ -28,6 +28,14 @@
} }
} }
}, },
{
"hidden": true,
"name": "vcpkg_ci",
"description": "Use the GitHub Actions vcpkg cache",
"environment": {
"VCPKG_BINARY_SOURCES": "clear;x-gha,readwrite"
}
},
{ {
"name": "Sanitizer", "name": "Sanitizer",
"inherits": "default", "inherits": "default",
@@ -39,6 +47,32 @@
"ENABLE_UNDEFINED_SANITIZER": "ON", "ENABLE_UNDEFINED_SANITIZER": "ON",
"ENABLE_ADDRESS_SANITIZER": "ON" "ENABLE_ADDRESS_SANITIZER": "ON"
} }
},
{
"name": "CI",
"inherits": ["vcpkg_ci", "default" ],
"displayName": "Non-Sanitizer CI Config"
},
{
"name": "Sanitizer_CI",
"inherits": ["vcpkg_ci", "Sanitizer" ],
"displayName": "Sanitizer CI Config",
"cacheVariables": {
"CMAKE_BUILD_TYPE": ""
}
},
{
"name": "Fuzzers_CI",
"inherits": ["vcpkg_ci", "default" ],
"displayName": "Fuzzers Config",
"description": "Fuzzers build with GitHub Actions cache",
"binaryDir": "${sourceDir}/Build/ladybird-fuzzers",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "",
"ENABLE_QT": "OFF",
"ENABLE_FUZZERS_LIBFUZZER": "ON",
"ENABLE_ADDRESS_SANITIZER": "ON"
}
} }
], ],
"buildPresets": [ "buildPresets": [