diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed979e0..20dbbfb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v2 - name: Install deps run: | - sudo apt install ccache llvm clang lld meson ninja-build -y + sudo apt install ccache libreadline-dev llvm clang lld meson ninja-build -y - uses: actions-rs/toolchain@v1 with: profile: minimal @@ -38,7 +38,7 @@ jobs: - name: Get SM pkg run: ./tools/get_sm.sh - name: ccache cache files - uses: actions/cache@v1.1.0 + uses: actions/cache@v4 with: path: ~/.ccache key: ${{ runner.os }}-${{ hashFiles('**/mozjs.tar.xz') }} @@ -48,6 +48,7 @@ jobs: tar -xf mozjs.tar.xz -C /tmp/mozjs cd /tmp/mozjs cd $(ls -d */|head -n 1) + cargo install cbindgen cd js/src bash $GITHUB_WORKSPACE/tools/generic_lib.sh $GITHUB_WORKSPACE/meson.build mkdir _build @@ -57,8 +58,9 @@ jobs: ccache -z make sudo make install + sudo cp /usr/local/lib/pkgconfig/mozjs-*.pc /usr/local/lib/pkgconfig/mozjs.pc ccache -s - name: Build Examples run: | - meson _build || cat _build/meson-logs/meson-log.txt + meson setup _build || cat _build/meson-logs/meson-log.txt ninja -C _build diff --git a/tools/generic_lib.sh b/tools/generic_lib.sh index 344b058..9b548e5 100755 --- a/tools/generic_lib.sh +++ b/tools/generic_lib.sh @@ -1,5 +1,4 @@ #!/bin/bash -# Make SpiderMonkey and this repo generic instead of version specific. -# script shoud be run in mozjs dir with $1 for meson.build location -sed -i 's/mozjs-$MOZILLA_SYMBOLVERSION/mozjs/g' old-configure.in +# Make this repo generic instead of version specific. +# run script with $1 for meson.build location sed -i --regexp-extended "s/dependency\(.mozjs.*$/dependency('mozjs')/gm" "$1"