Skip to content

Commit

Permalink
Chore: Remove workmanager override to fix linux arm64 build
Browse files Browse the repository at this point in the history
  • Loading branch information
adil192 committed Feb 24, 2025
1 parent df03da8 commit ed907e9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 164 deletions.
152 changes: 0 additions & 152 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,97 +4,8 @@ on:
# Enable manual run
workflow_dispatch:
push:
tags:
- '**'
branches:
- '**'
paths:
- .github/workflows/linux.yml
- appimage/AppImageBuilder.yml

jobs:
build-flutter-app-x86_64:
name: Build Flutter app (x86_64)
runs-on: ubuntu-latest
permissions:
contents: write
timeout-minutes: 20
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install apt dependencies
uses: awalsh128/cache-apt-pkgs-action@latest
with:
packages: libgtk-3-dev libx11-dev pkg-config cmake ninja-build libblkid-dev libsecret-1-dev libjsoncpp-dev ghostscript libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libunwind-dev webkit2gtk-4.1-dev
version: 1.0
execute_install_scripts: true

- name: Setup cache
uses: actions/cache@v4
with:
path: |
build
key: ${{ runner.OS }}-saber-${{ hashFiles('**/pubspec.lock') }}-${{ hashFiles('**/*.dart') }}
restore-keys: |
${{ runner.OS }}-saber-
- name: Remove proprietary dependencies
run: ./patches/remove_proprietary_dependencies.sh

- name: Setup Flutter
uses: subosito/flutter-action@v2
with:
channel: stable
cache: true
cache-key: 'flutter-:os:-:channel:-:version:-:arch:'

- name: Disable Flutter CLI animations
run: flutter config --no-cli-animations

- run: flutter pub get

- name: Build Linux (x86_64)
run: |
flutter build linux \
--dart-define=DIRTY=$DIRTY
env:
DIRTY: ${{ !startsWith(github.ref, 'refs/tags/') }}

- name: Compress Flutter build
id: compress
run: |
buildName=$(grep -oP "(?<=buildName = ').*(?=')" lib/data/version.dart)
archiveName="Saber_v${buildName}_Linux_x86_64.tar.gz"
echo "archiveName=$archiveName" >> $GITHUB_OUTPUT
mkdir -p AppDir
mv build/linux/x64/release/bundle/* AppDir
chmod +x AppDir/saber
install -Dm644 flatpak/com.adilhanney.saber.metainfo.xml -t AppDir/share/metainfo/
install -Dm644 flatpak/com.adilhanney.saber.metainfo.xml -t AppDir/usr/share/metainfo/
install -Dm644 assets/icon/icon.svg AppDir/share/icons/hicolor/scalable/apps/com.adilhanney.saber.svg
install -Dm644 assets/icon/icon.svg AppDir/usr/share/icons/hicolor/scalable/apps/com.adilhanney.saber.svg
install -Dm644 flatpak/com.adilhanney.saber.desktop -t AppDir/share/applications/
tar -C AppDir -cvf $archiveName .
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: Saber-Archive-x86_64
path: ${{ steps.compress.outputs.archiveName }}

- name: Upload to GitHub release
uses: svenstaro/upload-release-action@v2
if: ${{ startsWith(github.ref, 'refs/tags/') }}
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{ steps.compress.outputs.archiveName }}

build-flutter-app-arm64:
name: Build Flutter app (arm64)
runs-on: ubuntu-latest
Expand Down Expand Up @@ -255,66 +166,3 @@ jobs:
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{ steps.compress.outputs.archiveName }}

build-appimage:
name: Build AppImage
needs: build-flutter-app-x86_64
runs-on: ubuntu-latest
permissions:
contents: write
timeout-minutes: 10
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install AppImage dependencies
run: |
sudo add-apt-repository universe
sudo apt install libfuse2
- name: Download app archive
uses: actions/download-artifact@v4
with:
name: Saber-Archive-x86_64

- name: Rename app archive
run: |
mv Saber_*.tar.gz Saber-Linux-Portable.tar.gz
- name: Download appimage-builder
working-directory: appimage
run: |
wget -O appimage-builder-x86_64.AppImage https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage
chmod +x appimage-builder-x86_64.AppImage
- name: Prepare build files
working-directory: appimage
run: |
mkdir AppDir
tar -xvf ../Saber-Linux-Portable.tar.gz -C AppDir
- name: Set AppImage version
working-directory: appimage
run: |
# replace line with "version: latest" with "version: $buildName"
buildName=$(grep -oP "(?<=buildName = ').*(?=')" ../lib/data/version.dart)
sed -i "s/version: latest/version: ${buildName}/" AppImageBuilder.yml
- name: Build AppImage
working-directory: appimage
run: |
./appimage-builder-x86_64.AppImage --skip-test
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: AppImage artifact
path: appimage/Saber-*-x86_64.AppImage*

- name: Upload to GitHub release
uses: svenstaro/upload-release-action@v2
if: ${{ startsWith(github.ref, 'refs/tags/') }}
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: appimage/Saber-*-x86_64.AppImage*
file_glob: true
9 changes: 4 additions & 5 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1861,11 +1861,10 @@ packages:
workmanager:
dependency: "direct main"
description:
path: workmanager
ref: main
resolved-ref: "4ce065135dc1b91fee918f81596b42a56850391d"
url: "https://github.com/fluttercommunity/flutter_workmanager"
source: git
name: workmanager
sha256: ed13530cccd28c5c9959ad42d657cd0666274ca74c56dea0ca183ddd527d3a00
url: "https://pub.dev"
source: hosted
version: "0.5.2"
xdg_directories:
dependency: transitive
Expand Down
7 changes: 0 additions & 7 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -180,13 +180,6 @@ dependency_overrides:
url: https://github.com/ad-angelo/receive_sharing_intent
ref: deec27f3dd36d6c9f51c22d0026baa7b6f0850a3

# https://github.com/fluttercommunity/flutter_workmanager/issues/588
workmanager:
git:
url: https://github.com/fluttercommunity/flutter_workmanager
path: workmanager
ref: main

# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec

Expand Down

0 comments on commit ed907e9

Please sign in to comment.