From 617744503d87a63221f7fe331ad7b349014dab16 Mon Sep 17 00:00:00 2001 From: Krille Date: Sat, 26 Oct 2024 10:46:00 +0200 Subject: [PATCH] build: Also build for arm64 for linux releases --- .github/workflows/integrate.yaml | 6 +++--- .github/workflows/release.yaml | 25 ++++++++++++++----------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index e27ac7ee6..ce96b903c 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -61,8 +61,8 @@ jobs: build_debug_linux: strategy: matrix: - os: [ubuntu-latest, self-hosted] - runs-on: ${{ matrix.os }} + arch: [ x64, arm64 ] + runs-on: ${{ matrix.arch == 'arm64' && 'self-hosted' || 'ubuntu-latest'}} steps: - uses: actions/checkout@v4 - run: cat .github/workflows/versions.env >> $GITHUB_ENV @@ -73,7 +73,7 @@ jobs: git clone --branch ${{ env.FLUTTER_VERSION }} https://github.com/flutter/flutter.git ./flutter/bin/flutter doctor - run: ./flutter/bin/flutter pub get - - run: ./flutter/bin/flutter build linux + - run: ./flutter/bin/flutter build linux --target-platform linux-${{ matrix.arch }} build_debug_ios: runs-on: macos-latest diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 204d1e0e0..d471abb4f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -104,28 +104,31 @@ jobs: asset_content_type: application/vnd.android.package-archive build_linux: - runs-on: ubuntu-latest + strategy: + matrix: + arch: [ x64, arm64 ] + runs-on: ${{ matrix.arch == 'arm64' && 'self-hosted' || 'ubuntu-latest'}} steps: - uses: actions/checkout@v4 - run: cat .github/workflows/versions.env >> $GITHUB_ENV - - uses: subosito/flutter-action@v2 - with: - flutter-version: ${{ env.FLUTTER_VERSION }} - cache: true - name: Install dependencies - run: sudo apt-get update && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 libssl-dev -y - - run: flutter pub get - - run: flutter build linux --release --target-platform linux-x64 + run: sudo apt-get update && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 libssl-dev libwebkit2gtk-4.1-dev -y + - name: Install Flutter + run: | + git clone --branch ${{ env.FLUTTER_VERSION }} https://github.com/flutter/flutter.git + ./flutter/bin/flutter doctor + - run: ./flutter/bin/flutter pub get + - run: ./flutter/bin/flutter build linux --target-platform linux-${{ matrix.arch }} - name: Create archive - run: tar -czf fluffychat-linux-x64.tar.gz -C build/linux/x64/release/bundle/ . + run: tar -czf fluffychat-linux-${{ matrix.arch }}.tar.gz -C build/linux/${{ matrix.arch }}/release/bundle/ . - name: Upload to release uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.PAGES_DEPLOY_TOKEN }} with: upload_url: ${{ github.event.release.upload_url }} - asset_path: fluffychat-linux-x64.tar.gz - asset_name: fluffychat-linux-x64.tar.gz + asset_path: fluffychat-linux-${{ matrix.arch }}.tar.gz + asset_name: fluffychat-linux-${{ matrix.arch }}.tar.gz asset_content_type: application/gzip deploy_playstore: