Skip to content

Fix CI on 'next' branch #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ptomato wants to merge 5 commits into
base: esr128
Choose a base branch
from
Open

Fix CI on 'next' branch #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
13cb033
Update deprecated version of actions/cache
ptomato Jul 19, 2025
9f600f5
Install cbindgen dependency with cargo
ptomato Jul 19, 2025
b97ea81
Fix sed script for version-independent .pc file
ptomato Jul 19, 2025
9e0ffa8
Use meson setup command explicitly
ptomato Jul 20, 2025
adec57e
Install readline dependency
ptomato Jul 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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') }}
Expand All @@ -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
Expand All @@ -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
5 changes: 2 additions & 3 deletions tools/generic_lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Loading