From f660fc97a97e708fe90472044fbdcb80caa30d71 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Mon, 14 Aug 2023 13:32:31 -0600 Subject: [PATCH] CI: Specify SERENITY_CACHE_DIR for test262 job We weren't actually using the caches at all for this job after some path changes recently. --- .github/workflows/libjs-test262.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/libjs-test262.yml b/.github/workflows/libjs-test262.yml index 380fdc71156..7da9c4c7d5f 100644 --- a/.github/workflows/libjs-test262.yml +++ b/.github/workflows/libjs-test262.yml @@ -78,19 +78,19 @@ jobs: - name: TimeZoneData cache uses: actions/cache@v3 with: - path: ${{ github.workspace }}/libjs-test262/Build/TZDB + path: ${{ github.workspace }}/libjs-test262/Build/caches/TZDB key: TimeZoneData-${{ hashFiles('Meta/CMake/time_zone_data.cmake') }} - name: UnicodeData cache uses: actions/cache@v3 with: - path: ${{ github.workspace }}/libjs-test262/Build/UCD + path: ${{ github.workspace }}/libjs-test262/Build/caches/UCD key: UnicodeData-${{ hashFiles('Meta/CMake/unicode_data.cmake') }} - name: UnicodeLocale cache uses: actions/cache@v3 with: - path: ${{ github.workspace }}/libjs-test262/Build/CLDR + path: ${{ github.workspace }}/libjs-test262/Build/caches/CLDR key: UnicodeLocale-${{ hashFiles('Meta/CMake/locale_data.cmake') }} - name: Get previous results @@ -102,7 +102,13 @@ jobs: working-directory: libjs-test262 run: | env PATH="/opt/wabt-1.0.27/bin:$PATH" \ - cmake -GNinja -B Build -DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12 -DWASM_SPEC_TEST_SKIP_FORMATTING=ON -DINCLUDE_WASM_SPEC_TESTS=ON -DSERENITY_SOURCE_DIR=${{ env.SERENITY_SOURCE_DIR }} + cmake -GNinja -B Build \ + -DCMAKE_C_COMPILER=gcc-12 \ + -DCMAKE_CXX_COMPILER=g++-12 \ + -DWASM_SPEC_TEST_SKIP_FORMATTING=ON \ + -DINCLUDE_WASM_SPEC_TESTS=ON \ + -DSERENITY_SOURCE_DIR=${{ env.SERENITY_SOURCE_DIR }} \ + -DSERENITY_CACHE_DIR=Build/caches ninja -C Build test262-runner test-js test-wasm - name: Run test262 and test262-parser-tests