From 66ca08faac87ce03d572ec914340a4ed5a1341d5 Mon Sep 17 00:00:00 2001 From: "pavel.sergeev" Date: Thu, 31 Oct 2024 14:42:47 +0100 Subject: [PATCH 1/4] update skiko m126 to commit 6bfb13368b --- .github/workflows/build.yml | 2 +- README.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a3518cf..d402f1d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ on: default: 'false' env: - version: m126-d2aaacc35d-4 + version: m126-6bfb13368b jobs: macos: diff --git a/README.md b/README.md index 231e8fc..e4518fd 100644 --- a/README.md +++ b/README.md @@ -16,15 +16,15 @@ Prebuilt binaries can be found [in releases](https://github.com/JetBrains/skia-p ## Building locally ```sh -python3 script/checkout.py --version m126-d2aaacc35d-4 +python3 script/checkout.py --version m126-6bfb13368b python3 script/build.py -python3 script/archive.py --version m126-d2aaacc35d-4 +python3 script/archive.py --version m126-6bfb13368b ``` To build a debug build: ```sh -python3 script/checkout.py --version m126-d2aaacc35d-4 +python3 script/checkout.py --version m126-6bfb13368b python3 script/build.py --build-type Debug -python3 script/archive.py --version m126-d2aaacc35d-4 --build-type Debug +python3 script/archive.py --version m126-6bfb13368b --build-type Debug ``` From d0bc481b102af426e92423d0f6037a6560b56f75 Mon Sep 17 00:00:00 2001 From: "pavel.sergeev" Date: Thu, 31 Oct 2024 15:50:55 +0100 Subject: [PATCH 2/4] use ubuntu 22.04 --- .github/workflows/build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d402f1d..f349795 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,7 +53,7 @@ jobs: linux: runs-on: ubuntu-latest - container: ubuntu:20.04 + container: ubuntu:22.04 strategy: matrix: build_type: [Debug, Release] @@ -80,7 +80,7 @@ jobs: linux-wasm: runs-on: ubuntu-latest - container: ubuntu:20.04 + container: ubuntu:22.04 strategy: matrix: build_type: [ Debug, Release ] @@ -107,7 +107,7 @@ jobs: linux-android: runs-on: ubuntu-latest - container: ubuntu:20.04 + container: ubuntu:22.04 strategy: matrix: build_type: [ Debug, Release ] @@ -145,13 +145,13 @@ jobs: fail-fast: false steps: - uses: actions/checkout@v2 - - uses: uraimo/run-on-arch-action@v2.0.5 + - uses: uraimo/run-on-arch-action@v2.8.1 name: Assemble id: assemble if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }} with: arch: aarch64 - distro: ubuntu20.04 + distro: ubuntu22.04 githubToken: ${{ secrets.GITHUB_TOKEN }} # Mount checkout directory as /checkout in the container dockerRunArgs: | @@ -174,13 +174,13 @@ jobs: python3 script/build.py --build-type ${build_type} --build-type ${build_type} python3 script/archive.py --version ${build_version} --build-type ${build_type} echo "Produced artifact at ${PWD}/${artifact_name}" - - uses: uraimo/run-on-arch-action@v2.0.5 + - uses: uraimo/run-on-arch-action@v2.8.1 name: Test Build id: test-build if: ${{ github.event.inputs.skip_release == 'true' || github.ref != 'refs/heads/main' }} with: arch: aarch64 - distro: ubuntu20.04 + distro: ubuntu22.04 githubToken: ${{ secrets.GITHUB_TOKEN }} # Mount checkout directory as /checkout in the container dockerRunArgs: | From 29deebfb74547f378c4fbd2dc7b47a12c8b9c073 Mon Sep 17 00:00:00 2001 From: "pavel.sergeev" Date: Thu, 31 Oct 2024 15:56:14 +0100 Subject: [PATCH 3/4] install python3 explicitly --- script/prepare_linux.sh | 2 +- script/prepare_linux_arm.sh | 2 +- script/prepare_linux_wasm.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/script/prepare_linux.sh b/script/prepare_linux.sh index 3180a16..06db3f6 100755 --- a/script/prepare_linux.sh +++ b/script/prepare_linux.sh @@ -13,5 +13,5 @@ apt-get install gcc-9 g++-9 -y update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9 update-alternatives --config gcc -apt-get install git python wget -y +apt-get install git python3 wget -y apt-get install ninja-build fontconfig libfontconfig1-dev libglu1-mesa-dev curl zip -y \ No newline at end of file diff --git a/script/prepare_linux_arm.sh b/script/prepare_linux_arm.sh index 731d5ee..0e9cc60 100755 --- a/script/prepare_linux_arm.sh +++ b/script/prepare_linux_arm.sh @@ -6,5 +6,5 @@ export DEBIAN_FRONTEND=noninteractive apt-get update -y apt-get install binutils build-essential -y apt-get install software-properties-common -y -apt-get install python git fontconfig libfontconfig1-dev libglu1-mesa-dev curl wget -y +apt-get install python3 git fontconfig libfontconfig1-dev libglu1-mesa-dev curl wget -y apt-get install clang -y diff --git a/script/prepare_linux_wasm.sh b/script/prepare_linux_wasm.sh index beae961..df4ee4d 100755 --- a/script/prepare_linux_wasm.sh +++ b/script/prepare_linux_wasm.sh @@ -6,4 +6,4 @@ export DEBIAN_FRONTEND=noninteractive apt-get update -y apt-get install binutils build-essential -y apt-get install software-properties-common -y -apt-get install python git curl wget -y \ No newline at end of file +apt-get install python3 git curl wget -y \ No newline at end of file From 9321172f32fe863fcc75ca230fb1df5302b3aeea Mon Sep 17 00:00:00 2001 From: "pavel.sergeev" Date: Thu, 31 Oct 2024 16:36:17 +0100 Subject: [PATCH 4/4] we can't use ubuntu 22.04 yet because of https://issues.skia.org/issues/361885736 --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f349795..b9dee78 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,7 +53,7 @@ jobs: linux: runs-on: ubuntu-latest - container: ubuntu:22.04 + container: ubuntu:20.04 strategy: matrix: build_type: [Debug, Release] @@ -80,7 +80,7 @@ jobs: linux-wasm: runs-on: ubuntu-latest - container: ubuntu:22.04 + container: ubuntu:20.04 strategy: matrix: build_type: [ Debug, Release ] @@ -107,7 +107,7 @@ jobs: linux-android: runs-on: ubuntu-latest - container: ubuntu:22.04 + container: ubuntu:20.04 strategy: matrix: build_type: [ Debug, Release ] @@ -151,7 +151,7 @@ jobs: if: ${{ github.event.inputs.skip_release != 'true' && github.ref == 'refs/heads/main' }} with: arch: aarch64 - distro: ubuntu22.04 + distro: ubuntu20.04 githubToken: ${{ secrets.GITHUB_TOKEN }} # Mount checkout directory as /checkout in the container dockerRunArgs: | @@ -180,7 +180,7 @@ jobs: if: ${{ github.event.inputs.skip_release == 'true' || github.ref != 'refs/heads/main' }} with: arch: aarch64 - distro: ubuntu22.04 + distro: ubuntu20.04 githubToken: ${{ secrets.GITHUB_TOKEN }} # Mount checkout directory as /checkout in the container dockerRunArgs: |