CI: Use the distribution release configuration for js artifacts

This commit is contained in:
Timothy Flynn 2024-11-08 09:21:53 -05:00 committed by Andrew Kaster
parent 0447d05d52
commit 74fe899d79
Notes: github-actions[bot] 2024-11-08 18:30:21 +00:00
2 changed files with 5 additions and 12 deletions

View file

@ -49,8 +49,7 @@ jobs:
- name: Create build directory Ubuntu
run: |
cmake --preset CI -B Build \
-DCMAKE_BUILD_TYPE=Release \
cmake --preset Distribution_CI \
-DCMAKE_C_COMPILER=gcc-13 \
-DCMAKE_CXX_COMPILER=g++-13 \
-DENABLE_GUI_TARGETS=OFF
@ -62,14 +61,13 @@ jobs:
# See: https://github.com/microsoft/vcpkg/discussions/19454
- name: Create build directory macOS
run: |
cmake --preset CI -B Build \
-DCMAKE_BUILD_TYPE=Release \
cmake --preset Distribution_CI \
-DCMAKE_OSX_DEPLOYMENT_TARGET="11.0" \
-DENABLE_GUI_TARGETS=OFF
if: ${{ matrix.os_name == 'macOS' }}
- name: Build and package js
working-directory: Build
working-directory: Build/distribution
run: |
ninja js
cpack
@ -85,5 +83,5 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: ladybird-js-${{ matrix.package_type }}
path: Build/ladybird-js*.tar.gz
path: Build/distribution/ladybird-js*.tar.gz
retention-days: 7

View file

@ -581,12 +581,7 @@ if (BUILD_TESTING)
)
endif()
# FIXME: When we are using CMake >= 3.21, the library installations can be replaced with RUNTIME_DEPENDENCIES.
# https://cmake.org/cmake/help/latest/command/install.html
include(get_linked_lagom_libraries.cmake)
get_linked_lagom_libraries(js js_libraries)
install(TARGETS js ${js_libraries} COMPONENT js)
install(TARGETS js COMPONENT js)
set(CPACK_GENERATOR "TGZ")
set(CPACK_STRIP_FILES TRUE)