Merge pull request #56 from JetBrains/update-skiko-m126-to-6bfb13368b

update skiko m126 to commit 6bfb13368b
JetBrains · Oct 31, 2024 · 3b12d7c · 3b12d7c
2 parents e287d4c + 9321172
commit 3b12d7c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git 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:
@@ -145,7 +145,7 @@ 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' }}
@@ -174,7 +174,7 @@ 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' }}

diff --git 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
 ```
diff --git 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
diff --git 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
@@ -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
+apt-get install python3 git curl wget -y