From 9d9d62ae9ed9e5ba8513dd222f1027f42d9ace6b Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Fri, 30 May 2025 20:11:55 +0200 Subject: [PATCH 1/2] renable linux arm in CI --- .github/workflows/main.yml | 16 ++++++++++++++++ .github/workflows/publish.yml | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4ccafff16e..01c02be763 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -261,6 +261,22 @@ jobs: command: "build", args: "--package dioxus-mobile", } + - { + target: x86_64-unknown-linux-gnu, + os: ubuntu-latest, + toolchain: "1.86.0", + cross: false, + command: "build", + args: "--all --tests", + } + - { + target: aarch64-unknown-linux-gnu, + os: ubuntu-24.04-arm, + toolchain: "1.86.0", + cross: false, + command: "build", + args: "--all --tests", + } - { target: aarch64-linux-android, os: ubuntu-latest, diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index beededbaba..b1f7c0767a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -59,8 +59,8 @@ jobs: os: macos-latest - target: x86_64-unknown-linux-gnu os: ubuntu-22.04 - # - target: aarch64-unknown-linux-gnu - # os: ubuntu-latest + - target: aarch64-unknown-linux-gnu + os: ubuntu-24.04-arm steps: - name: Checkout uses: actions/checkout@v4 From d3322ab04663f2107d63d6f495def3fa89542ed1 Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Sat, 31 May 2025 21:44:40 +0200 Subject: [PATCH 2/2] pin ubuntu --- .github/workflows/main.yml | 32 +++++++++++++++++++++----------- .github/workflows/publish.yml | 12 +++++++++++- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 01c02be763..8f3258ff31 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -45,7 +45,7 @@ jobs: check-msrv: if: github.event.pull_request.draft == false name: Check MSRV - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@1.86.0 @@ -66,7 +66,7 @@ jobs: test: if: github.event.pull_request.draft == false name: Test Suite - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: Free Disk Space @@ -87,7 +87,7 @@ jobs: release-test: if: github.event.pull_request.draft == false name: Test Suite with Optimizations - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: Free Disk Space @@ -108,7 +108,7 @@ jobs: fmt: if: github.event.pull_request.draft == false name: Rustfmt - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@1.86.0 @@ -122,7 +122,7 @@ jobs: docs: if: github.event.pull_request.draft == false name: Docs - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: awalsh128/cache-apt-pkgs-action@latest @@ -145,7 +145,7 @@ jobs: check: if: github.event.pull_request.draft == false name: Check - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: awalsh128/cache-apt-pkgs-action@latest @@ -161,7 +161,7 @@ jobs: clippy: if: github.event.pull_request.draft == false name: Clippy - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: awalsh128/cache-apt-pkgs-action@latest @@ -181,7 +181,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-24.04, macos-latest] steps: - uses: actions/checkout@v4 - uses: nixbuild/nix-quick-install-action@master @@ -263,7 +263,7 @@ jobs: } - { target: x86_64-unknown-linux-gnu, - os: ubuntu-latest, + os: ubuntu-24.04, toolchain: "1.86.0", cross: false, command: "build", @@ -279,7 +279,7 @@ jobs: } - { target: aarch64-linux-android, - os: ubuntu-latest, + os: ubuntu-24.04, toolchain: "1.86.0", cross: true, command: "build", @@ -299,6 +299,16 @@ jobs: if: ${{ matrix.platform.target == 'x86_64-pc-windows-msvc' }} uses: ilammy/setup-nasm@v1 + - name: Free Disk Space + if: ${{ matrix.platform.os == 'ubuntu-24.04' || matrix.platform.os == 'ubuntu-24.04-arm' }} + uses: ./.github/actions/free-disk-space + + - uses: awalsh128/cache-apt-pkgs-action@latest + if: ${{ matrix.platform.os == 'ubuntu-24.04' || matrix.platform.os == 'ubuntu-24.04-arm' }} + with: + packages: libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev libxdo-dev + version: 1.0 + - name: Install cross if: ${{ matrix.platform.cross == true }} uses: taiki-e/install-action@cross @@ -351,7 +361,7 @@ jobs: # semver: # if: github.event.pull_request.draft == false && !contains(github.event.pull_request.labels.*.name, 'breaking') # name: Semver Check - # runs-on: ubuntu-latest + # runs-on: ubuntu-24.04 # steps: # - uses: actions/checkout@v4 # - uses: dtolnay/rust-toolchain@1.86.0 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b1f7c0767a..5c949b4912 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -58,7 +58,7 @@ jobs: - target: aarch64-apple-darwin os: macos-latest - target: x86_64-unknown-linux-gnu - os: ubuntu-22.04 + os: ubuntu-24.04 - target: aarch64-unknown-linux-gnu os: ubuntu-24.04-arm steps: @@ -73,6 +73,16 @@ jobs: if: ${{ matrix.platform.target == 'x86_64-pc-windows-msvc' }} uses: ilammy/setup-nasm@v1 + - name: Free Disk Space + if: ${{ matrix.platform.os == 'ubuntu-24.04' || matrix.platform.os == 'ubuntu-24.04-arm' }} + uses: ./.github/actions/free-disk-space + + - uses: awalsh128/cache-apt-pkgs-action@latest + if: ${{ matrix.platform.os == 'ubuntu-24.04' || matrix.platform.os == 'ubuntu-24.04-arm' }} + with: + packages: libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev libxdo-dev + version: 1.0 + - name: Install stable uses: dtolnay/rust-toolchain@master with: