Skip to content

Commit

Permalink
Massage CI
Browse files Browse the repository at this point in the history
  • Loading branch information
tonsky committed Feb 13, 2025
1 parent f4f578d commit fb7ee46
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
build_macos:
runs-on: macos-13
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: abdes/gha-setup-ninja@660f330a40aefa8d11632b3f901e92a4adb33d65
Expand All @@ -38,20 +38,20 @@ jobs:
- run: python3 script/build.py
- run: python3 script/test.py
- run: python3 script/package_platform.py
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: macos-x64-jars
path: target/skija-macos-x64-*
- run: python3 script/clean.py
- run: python3 script/build.py --arch arm64
- run: python3 script/package_platform.py --arch arm64
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: macos-arm64-jars
path: target/skija-macos-arm64-*

build_linux:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- run: |
echo "JAVA_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
Expand All @@ -60,34 +60,34 @@ jobs:
sudo apt-get --quiet --yes install ninja-build libglu1-mesa-dev libegl-dev g\+\+-9-aarch64-linux-gnu libwayland-dev libglvnd-dev libegl1-mesa libegl1-mesa-dev
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9
sudo update-alternatives --config gcc
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- run: python3 script/build.py
- run: python3 script/package_shared.py
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: shared-jars
path: target/skija-shared-*.jar
- run: python3 script/test.py
- run: python3 script/package_platform.py
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: linux-x64-jars
path: target/skija-linux-x64-*
# Disabled until https://github.com/HumbleUI/SkiaBuild/issues/8
# - run: python3 script/clean.py
# - run: python3 script/build.py --arch arm64
# - run: python3 script/package_platform.py --arch arm64
# - uses: actions/upload-artifact@v3
# - uses: actions/upload-artifact@v4
# with:
# name: linux-arm64-jars
# path: target/skija-linux-arm64-*

build_windows:
runs-on: windows-2022
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: microsoft/setup-msbuild@v1
- uses: ilammy/msvc-dev-cmd@v1
- uses: abdes/gha-setup-ninja@660f330a40aefa8d11632b3f901e92a4adb33d65
Expand All @@ -99,7 +99,7 @@ jobs:
- shell: bash
run: python3 script/test.py
- run: python3 script/package_platform.py
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: windows-x64-jars
path: target/skija-windows-x64-*
Expand All @@ -109,31 +109,31 @@ jobs:
runs-on: ubuntu-latest
needs: [build_windows, build_linux, build_macos]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: |
echo "JAVA_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
echo "$JAVA_HOME_11_X64/bin" >> $GITHUB_PATH
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: shared-jars
path: target
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: macos-x64-jars
path: target
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: macos-arm64-jars
path: target
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: linux-x64-jars
path: target
# - uses: actions/download-artifact@v3
# - uses: actions/download-artifact@v4
# with:
# name: linux-arm64-jars
# path: target
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: windows-x64-jars
path: target
Expand Down

0 comments on commit fb7ee46

Please sign in to comment.