Skip to content

Commit 65975ba

Browse files
committed
Update to node 16.4.2
1 parent a041700 commit 65975ba

File tree

6 files changed

+26
-24
lines changed

6 files changed

+26
-24
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
rubocop:
77
name: Lint (Rubocop)
88
runs-on: ubuntu-20.04
9-
container: ruby:2.4
9+
container: ruby:2.6
1010
steps:
1111
- name: Checkout
1212
uses: actions/checkout@v2
@@ -30,7 +30,7 @@ jobs:
3030
outputs:
3131
GEM_VERSION: ${{ steps.set-metadata.outputs.GEM_VERSION }}
3232
runs-on: ubuntu-20.04
33-
container: ruby:2.4
33+
container: ruby:2.6
3434
steps:
3535
- name: Checkout
3636
uses: actions/checkout@v2
@@ -188,10 +188,10 @@ jobs:
188188
run: |
189189
case ${{ matrix.libc }} in
190190
gnu)
191-
echo 'ruby:3.0'
191+
echo 'ruby:2.4'
192192
;;
193193
musl)
194-
echo 'ruby:3.0-alpine'
194+
echo 'ruby:2.4-alpine'
195195
;;
196196
esac | tee container_image
197197
echo "::set-output name=image::$(cat container_image)"
@@ -200,7 +200,7 @@ jobs:
200200
echo "::set-output name=id::$(cat container_id)"
201201
- name: Install Alpine system dependencies
202202
if: ${{ matrix.libc == 'musl' }}
203-
run: docker exec -w "${PWD}" ${{ steps.container.outputs.id }} apk add --no-cache build-base linux-headers bash python2 python3 git curl tar clang
203+
run: docker exec -w "${PWD}" ${{ steps.container.outputs.id }} apk add --no-cache build-base linux-headers bash python2 python3 git curl tar
204204
- name: Install Debian cross-compiler
205205
if: ${{ matrix.libc == 'gnu' && matrix.platform != 'amd64' }}
206206
run: |
@@ -259,7 +259,7 @@ jobs:
259259
name: Test (ruby)
260260
needs: build-ruby
261261
runs-on: ubuntu-20.04
262-
container: ruby:2.5
262+
container: ruby:2.4
263263
steps:
264264
- name: Set metadata
265265
id: set-metadata

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
ARG RUBY_VERSION=2.3
1+
ARG RUBY_VERSION=2.4
22
FROM ruby:${RUBY_VERSION}
33

4-
RUN test ! -f /etc/alpine-release || apk add --no-cache build-base bash python2 python3 git curl tar clang binutils-gold
4+
RUN test ! -f /etc/alpine-release || apk add --no-cache build-base bash python2 python3 git curl tar
55

66
RUN mkdir -p /code
77
WORKDIR /code
88

9-
ARG NODE_VERSION=16.0.0
9+
ARG NODE_VERSION=16.4.2
1010

1111
COPY libexec/download-node /code/libexec/
1212
RUN ./libexec/download-node ${NODE_VERSION}

lib/libv8/node/version.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module Libv8; end
22

33
module Libv8::Node
4-
VERSION = '16.3.0.0'.freeze
5-
NODE_VERSION = '16.3.0'.freeze
6-
LIBV8_VERSION = '9.0.257.25'.freeze # from v8/include/v8-version.h
4+
VERSION = '16.4.2.0'.freeze
5+
NODE_VERSION = '16.4.2'.freeze
6+
LIBV8_VERSION = '9.1.269.36'.freeze # from v8/include/v8-version.h
77
end

libexec/extract-node

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extract "${src}" "${src}/node-v${version}.tar.gz"
2929

3030
cd "${src}/node-v${version}"
3131

32-
patch -p1 < "${top}"/patch/gyp-libv8_monolith.patch
32+
#patch -p1 < "${top}"/patch/gyp-libv8_monolith.patch
3333
patch -p1 < "${top}"/patch/py2-icutrim.patch
3434
patch -p1 < "${top}"/patch/py2-genv8constants.patch
3535

libexec/platform

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,18 @@ else
8989
configure_flags=''
9090
fi
9191

92-
case "${target_platform}" in
93-
arm64-*)
94-
configure_flags="${configure_flags} --experimental-enable-pointer-compression"
95-
;;
96-
arm*-*linux*)
97-
:
98-
;;
99-
*)
100-
configure_flags="${configure_flags} --experimental-enable-pointer-compression"
101-
;;
102-
esac
92+
# TODO: building with pointer compression is broken
93+
# case "${target_platform}" in
94+
# arm64-*)
95+
# configure_flags="${configure_flags} --experimental-enable-pointer-compression"
96+
# ;;
97+
# arm*-*linux*)
98+
# :
99+
# ;;
100+
# *)
101+
# configure_flags="${configure_flags} --experimental-enable-pointer-compression"
102+
# ;;
103+
# esac
103104

104105
cat <<EOF
105106
export CC='${CC}'

sums/v16.4.2.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
46d907a06fe020ee8d7e6753357b82edd16f3871f8caaa188841d29d265de7bd

0 commit comments

Comments
 (0)