1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 16:27:35 +00:00

CI: Don't build libjs for Lagom twice

We need test-js for the parser tests for test262, but we don't need to
rebuild all of Lagom twice. This was missed when we did the initial
change to shared libraries. Before #9017, the Lagom build for test-js
is what built libLagom.a for the libjs-test262-runner to link against.

Now that we are building libjs.so and its dependencies in the runner's
build directory, we should build test-js there as well.

Requires linusg/libjs-test262#32 in order to properly find the built
test-js.
This commit is contained in:
Andrew Kaster 2021-08-07 08:28:07 -06:00 committed by Linus Groh
parent f583cddaf7
commit c4604bc080

View file

@ -64,29 +64,21 @@ jobs:
- name: Create build directory - name: Create build directory
run: | run: |
mkdir -p Build/lagom mkdir -p libjs-test262/Build/UCD
mkdir -p Build/lagom/UCD
- name: UnicodeData cache - name: UnicodeData cache
# TODO: Change the version to the released version when https://github.com/actions/cache/pull/489 (or 571) is merged. # TODO: Change the version to the released version when https://github.com/actions/cache/pull/489 (or 571) is merged.
uses: actions/cache@03e00da99d75a2204924908e1cca7902cafce66b uses: actions/cache@03e00da99d75a2204924908e1cca7902cafce66b
with: with:
path: ${{ github.workspace }}/Build/lagom/UCD path: ${{ github.workspace }}/libjs-test262/Build/UCD
key: UnicodeData-${{ hashFiles('Userland/Libraries/LibUnicode/unicode_data.cmake') }} key: UnicodeData-${{ hashFiles('Userland/Libraries/LibUnicode/unicode_data.cmake') }}
- name: Build test-js - name: Build libjs-test262-runner and test-js
run: |
cd Build/lagom
cmake -GNinja -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 -DBUILD_LAGOM=ON ../../Meta/Lagom
ninja test-js
- name: Build libjs-test262-runner
working-directory: libjs-test262 working-directory: libjs-test262
run: | run: |
mkdir -p Build
cd Build cd Build
cmake -GNinja -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 -DSERENITY_SOURCE_DIR=${{ env.SERENITY_SOURCE_DIR }} .. cmake -GNinja -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 -DSERENITY_SOURCE_DIR=${{ env.SERENITY_SOURCE_DIR }} ..
ninja libjs-test262-runner ninja libjs-test262-runner test-js
- name: Run test262 and test262-parser-tests - name: Run test262 and test262-parser-tests
working-directory: libjs-test262 working-directory: libjs-test262