Skip to content

Commit

Permalink
feat: chrome/m108
Browse files Browse the repository at this point in the history
  • Loading branch information
Brooooooklyn committed Oct 23, 2022
1 parent e8a4f1a commit 04f5a41
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 21 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ jobs:
apt-get update &&
apt-get install -y wget &&
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - &&
echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" >> /etc/apt/sources.list &&
echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" >> /etc/apt/sources.list &&
echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main" >> /etc/apt/sources.list &&
echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main" >> /etc/apt/sources.list &&
apt-get update &&
apt-get install libc++-14-dev libc++abi-14-dev -y --fix-missing --no-install-recommends &&
rm /usr/lib/llvm-14/lib/libc++abi.so
apt-get install libc++-15-dev libc++abi-15-dev -y --fix-missing --no-install-recommends &&
rm /usr/lib/llvm-15/lib/libc++abi.so
- name: Build and push Linux aarch64
uses: docker/build-push-action@v3
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/skia.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: '2.x'
python-version: '3.x'
architecture: 'x64'

- name: Set env
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: '2.x'
python-version: '3.x'
architecture: 'x64'

- name: Set env
Expand Down Expand Up @@ -294,7 +294,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: '2.x'
python-version: '3.x'
architecture: 'x64'

- name: Set env
Expand Down Expand Up @@ -343,7 +343,7 @@ jobs:

- uses: actions/setup-python@v4
with:
python-version: '2.x'
python-version: '3.x'
architecture: 'x64'

- name: Set env
Expand Down
22 changes: 11 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,28 @@ ENV RUSTUP_HOME=/usr/local/rustup \
RUN apt-get update && \
apt-get install -y --fix-missing --no-install-recommends gpg-agent ca-certificates openssl && \
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" >> /etc/apt/sources.list && \
echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" >> /etc/apt/sources.list && \
echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main" >> /etc/apt/sources.list && \
echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main" >> /etc/apt/sources.list && \
curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
apt-get update && \
apt-get install -y --fix-missing --no-install-recommends \
curl \
llvm-14 \
clang-14 \
lld-14 \
libc++-14-dev \
libc++abi-14-dev \
llvm-15 \
clang-15 \
lld-15 \
libc++-15-dev \
libc++abi-15-dev \
nodejs \
rcs \
xz-utils \
rcs \
git \
make \
ninja-build && \
ln -sf /usr/bin/clang-14 /usr/bin/clang && \
ln -sf /usr/bin/clang++-14 /usr/bin/clang++ && \
ln -sf /usr/bin/lld-14 /usr/bin/lld && \
rm /usr/lib/llvm-14/lib/libc++abi.so && \
ln -sf /usr/bin/clang-15 /usr/bin/clang && \
ln -sf /usr/bin/clang++-15 /usr/bin/clang++ && \
ln -sf /usr/bin/lld-15 /usr/bin/lld && \
rm /usr/lib/llvm-15/lib/libc++abi.so && \
npm install --location=global yarn && \
npm cache clean --force && \
curl https://sh.rustup.rs -sSf | sh -s -- -y && \
Expand Down
1 change: 0 additions & 1 deletion scripts/build-skia.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ const GN_ARGS = [
`skia_use_harfbuzz=true`,
`skia_use_icu=true`,
`skia_use_sfntly=false`,
`skia_use_libgifcodec=true`,
`skia_use_libheif=true`,
`skia_use_libjpeg_turbo_decode=true`,
`skia_use_libjpeg_turbo_encode=true`,
Expand Down
2 changes: 1 addition & 1 deletion skia
Submodule skia updated 1126 files

1 comment on commit 04f5a41

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Benchmark

Benchmark suite Current: 04f5a41 Previous: e8a4f1a Ratio
Draw house#skia-canvas 18.9 ops/sec (±0.59%) 19.2 ops/sec (±1.47%) 1.02
Draw house#node-canvas 21.4 ops/sec (±1.06%) 21.7 ops/sec (±1.75%) 1.01
Draw house#@napi-rs/skia 18.5 ops/sec (±2.17%) 18.6 ops/sec (±1.37%) 1.01
Draw gradient#skia-canvas 17.9 ops/sec (±1.33%) 19 ops/sec (±0.87%) 1.06
Draw gradient#node-canvas 20.2 ops/sec (±1.33%) 21 ops/sec (±1.66%) 1.04
Draw gradient#@napi-rs/skia 17.7 ops/sec (±1.36%) 18 ops/sec (±1.37%) 1.02

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.