From 4d75357e2862a75281e7e757f7de7954e5701d18 Mon Sep 17 00:00:00 2001 From: Samson <16504129+sagudev@users.noreply.github.com> Date: Fri, 19 Jul 2024 22:08:44 +0200 Subject: [PATCH 1/7] Update main.yml --- .github/workflows/main.yml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 85441ffe..41a5d551 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,18 +2,31 @@ name: CI on: push: - branches: ['main'] pull_request: + workflow_dispatch: merge_group: types: [checks_requested] + schedule: + # Runs at 02:30, every Saturday + - cron: "30 2 * * 6" + jobs: Test: - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - { target: aarch64-apple-darwin, os: macos-14 } + - { target: x86_64-apple-darwin, os: macos-13 } + - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest } + - { target: aarch64-unknown-linux-gnu, os: ubuntu-latest } + - { target: x86_64-pc-windows-msvc, os: windows-latest } + runs-on: ${{ matrix.platform.os }} env: HARFBUZZ_SYS_NO_PKG_CONFIG: true steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: stable From d5e919eb566b5c4523e06fb4298e29b1f46976e7 Mon Sep 17 00:00:00 2001 From: Samson <16504129+sagudev@users.noreply.github.com> Date: Sat, 20 Jul 2024 07:31:23 +0200 Subject: [PATCH 2/7] Update main.yml --- .github/workflows/main.yml | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 41a5d551..522e7d11 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,43 +16,36 @@ jobs: strategy: fail-fast: false matrix: + toolchain: ['stable', 'nightly'] include: - { target: aarch64-apple-darwin, os: macos-14 } - { target: x86_64-apple-darwin, os: macos-13 } - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest } - { target: aarch64-unknown-linux-gnu, os: ubuntu-latest } - { target: x86_64-pc-windows-msvc, os: windows-latest } - runs-on: ${{ matrix.platform.os }} + runs-on: ${{ matrix.os }} env: HARFBUZZ_SYS_NO_PKG_CONFIG: true steps: - uses: actions/checkout@v4 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@v1 with: - toolchain: stable - override: true - profile: minimal - + toolchain: ${{ matrix.toolchain }} + target: ${{ matrix.target }} - name: Install packages + if: ${{ matrix.os == 'ubuntu-latest' }} run: | sudo apt-get update sudo apt-get install -y libegl1-mesa-dev libgtk-3-dev libsdl2-dev cmake - name: Install rustc target run: rustup target add aarch64-unknown-linux-gnu - - - name: Build arm64 simd - run: cargo build --target aarch64-unknown-linux-gnu - working-directory: simd - - - name: Build arm64 geometry - run: cargo build --target aarch64-unknown-linux-gnu - working-directory: geometry - name: Build - run: cargo build + run: cargo build --target ${{ matrix.target }} - name: Test + if: ${{ matrix.target != 'aarch64-unknown-linux-gnu' }} run: cargo test build_result: From a3b8ec26f802a81ae48d3b3347f92ea258e43dcf Mon Sep 17 00:00:00 2001 From: Samson <16504129+sagudev@users.noreply.github.com> Date: Sat, 20 Jul 2024 07:35:09 +0200 Subject: [PATCH 3/7] Update main.yml --- .github/workflows/main.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 522e7d11..83a031a3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,14 +16,14 @@ jobs: strategy: fail-fast: false matrix: - toolchain: ['stable', 'nightly'] - include: + toolchain: [stable, nightly] + platform: - { target: aarch64-apple-darwin, os: macos-14 } - { target: x86_64-apple-darwin, os: macos-13 } - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest } - { target: aarch64-unknown-linux-gnu, os: ubuntu-latest } - { target: x86_64-pc-windows-msvc, os: windows-latest } - runs-on: ${{ matrix.os }} + runs-on: ${{ matrix.platform.os }} env: HARFBUZZ_SYS_NO_PKG_CONFIG: true steps: @@ -31,21 +31,18 @@ jobs: - uses: dtolnay/rust-toolchain@v1 with: toolchain: ${{ matrix.toolchain }} - target: ${{ matrix.target }} + target: ${{ matrix.platform.target }} - name: Install packages - if: ${{ matrix.os == 'ubuntu-latest' }} + if: ${{ matrix.platform.os == 'ubuntu-latest' }} run: | sudo apt-get update sudo apt-get install -y libegl1-mesa-dev libgtk-3-dev libsdl2-dev cmake - - - name: Install rustc target - run: rustup target add aarch64-unknown-linux-gnu - name: Build - run: cargo build --target ${{ matrix.target }} + run: cargo build --target ${{ matrix.platform.target }} - name: Test - if: ${{ matrix.target != 'aarch64-unknown-linux-gnu' }} + if: ${{ matrix.platform.target != 'aarch64-unknown-linux-gnu' }} run: cargo test build_result: From 9b1facd86c0c9949e19a3c9a43c6d6975bdf2bfa Mon Sep 17 00:00:00 2001 From: Samson <16504129+sagudev@users.noreply.github.com> Date: Sat, 20 Jul 2024 07:44:07 +0200 Subject: [PATCH 4/7] Update main.yml --- .github/workflows/main.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 83a031a3..ba37d6b8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,18 @@ jobs: sudo apt-get update sudo apt-get install -y libegl1-mesa-dev libgtk-3-dev libsdl2-dev cmake + - name: Build arm64 simd + if: ${{ matrix.platform.target == 'aarch64-unknown-linux-gnu' }} + run: cargo build --target ${{ matrix.platform.target }} + working-directory: simd + + - name: Build arm64 geometry + if: ${{ matrix.platform.target == 'aarch64-unknown-linux-gnu' }} + run: cargo build --target ${{ matrix.platform.target }} + working-directory: geometry + - name: Build + if: ${{ matrix.platform.target != 'aarch64-unknown-linux-gnu' }} run: cargo build --target ${{ matrix.platform.target }} - name: Test From 2aa3b4ba33ba37a0000f906d1a756b94421bbe94 Mon Sep 17 00:00:00 2001 From: Samson <16504129+sagudev@users.noreply.github.com> Date: Sat, 20 Jul 2024 07:50:37 +0200 Subject: [PATCH 5/7] Update main.yml --- .github/workflows/main.yml | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ba37d6b8..7d69cf39 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,11 +18,18 @@ jobs: matrix: toolchain: [stable, nightly] platform: - - { target: aarch64-apple-darwin, os: macos-14 } - - { target: x86_64-apple-darwin, os: macos-13 } - - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest } - - { target: aarch64-unknown-linux-gnu, os: ubuntu-latest } - - { target: x86_64-pc-windows-msvc, os: windows-latest } + # native targets + - { target: aarch64-apple-darwin, os: macos-14, native: true } + - { target: x86_64-apple-darwin, os: macos-13, native: true } + - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, native: true } + - { target: x86_64-pc-windows-msvc, os: windows-latest, native: true } + # arm64 linux + - { target: aarch64-unknown-linux-gnu, os: ubuntu-latest, native: false } + # all servo's android targets + - { target: aarch64-linux-android, os: ubuntu-latest, native: false } + - { target: armv7-linux-androideabi, os: ubuntu-latest, native: false } + - { target: i686-linux-android, os: ubuntu-latest, native: false } + - { target: x86_64-linux-android, os: ubuntu-latest, native: false } runs-on: ${{ matrix.platform.os }} env: HARFBUZZ_SYS_NO_PKG_CONFIG: true @@ -38,22 +45,22 @@ jobs: sudo apt-get update sudo apt-get install -y libegl1-mesa-dev libgtk-3-dev libsdl2-dev cmake - - name: Build arm64 simd - if: ${{ matrix.platform.target == 'aarch64-unknown-linux-gnu' }} + - name: Build simd + if: ${{ !matrix.platform.native }} run: cargo build --target ${{ matrix.platform.target }} working-directory: simd - - name: Build arm64 geometry - if: ${{ matrix.platform.target == 'aarch64-unknown-linux-gnu' }} + - name: Build geometry + if: ${{ !matrix.platform.native }} run: cargo build --target ${{ matrix.platform.target }} working-directory: geometry - name: Build - if: ${{ matrix.platform.target != 'aarch64-unknown-linux-gnu' }} + if: ${{ matrix.platform.native }} run: cargo build --target ${{ matrix.platform.target }} - name: Test - if: ${{ matrix.platform.target != 'aarch64-unknown-linux-gnu' }} + if: ${{ matrix.platform.native }} run: cargo test build_result: From 6eb1a07192b615a58d012aaaad2e81a2aba4e0e9 Mon Sep 17 00:00:00 2001 From: Samson <16504129+sagudev@users.noreply.github.com> Date: Sat, 20 Jul 2024 07:57:58 +0200 Subject: [PATCH 6/7] sdl on win --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7d69cf39..af25d102 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,6 +39,12 @@ jobs: with: toolchain: ${{ matrix.toolchain }} target: ${{ matrix.platform.target }} + - uses: libsdl-org/setup-sdl@main + if: ${{ matrix.platform.os == 'windows-latest' }} + with: + install-linux-dependencies: true + version: 2-latest + version-sdl-image: 2-latest - name: Install packages if: ${{ matrix.platform.os == 'ubuntu-latest' }} run: | From 051467ebf48ff922c98527104c45ef04111a0de6 Mon Sep 17 00:00:00 2001 From: Samson <16504129+sagudev@users.noreply.github.com> Date: Sat, 20 Jul 2024 08:18:16 +0200 Subject: [PATCH 7/7] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index af25d102..d4051c28 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,6 +43,7 @@ jobs: if: ${{ matrix.platform.os == 'windows-latest' }} with: install-linux-dependencies: true + add-to-environment: true version: 2-latest version-sdl-image: 2-latest - name: Install packages