Skip to content

Commit

Permalink
Merge pull request #89 from GlitterWare/dev
Browse files Browse the repository at this point in the history
v1.8.0 - Entry Tags
  • Loading branch information
GleammerRay authored Mar 23, 2024
2 parents 29e8f66 + a0ba674 commit 7fee2f6
Show file tree
Hide file tree
Showing 97 changed files with 4,006 additions and 1,082 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ body:
label: App version
description: Select the app version. You can find it in the app settings under the `About` section.
options:
- v1.8.0 - Entry Tags
- v1.7.0 - Better Synchronization
- v1.6.0 - Markdown Notes
- v1.5.2 - Windows Hotfix
Expand Down
61 changes: 61 additions & 0 deletions .github/workflows/armv7.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
#! /bin/bash
cd /Passy

echo "===================================================="
echo "Install dependencies"
echo "===================================================="

apt-get update
apt-get -y install clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev binutils coreutils desktop-file-utils fakeroot fuse libgdk-pixbuf2.0-dev patchelf python3-pip python3-setuptools squashfs-tools strace util-linux zsync git file unzip zip wget curl libc6

echo "===================================================="
echo "Configure"
echo "===================================================="

export PATH="$PATH:$PWD/submodules/flutter/bin"
git config --global --add safe.directory /Passy
git config --global --add safe.directory /Passy/submodules/flutter
git submodule init
git submodule update

echo "===================================================="
echo "Install dart"
echo "===================================================="

mkdir submodules/flutter/bin/cache
flutter doctor
export LAST_PWD=$PWD
cd submodules/flutter/bin/cache
rm -rf dart-sdk
wget https://storage.googleapis.com/dart-archive/channels/stable/release/3.3.1/sdk/dartsdk-linux-arm-release.zip
unzip dartsdk-linux-arm-release.zip
rm dartsdk-linux-arm-release.zip
cd $LAST_PWD

echo "===================================================="
echo "Install flutter"
echo "===================================================="

flutter clean
flutter doctor

echo "===================================================="
echo "Configure flutter"
echo "===================================================="

flutter config --no-analytics

echo "===================================================="
echo "Build Passy CLI"
echo "===================================================="

bash build_cli.sh

echo "===================================================="
echo "Prepare releases"
echo "===================================================="

cd /passy-build
mkdir cli
cp -r /Passy/build/cli/latest/. cli

94 changes: 62 additions & 32 deletions .github/workflows/build-all-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,73 @@ on:
- main
- dev
jobs:
build_linux:
name: Build Passy for Android and Linux
build_android:
name: Build Passy for Android
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install dependencies
shell: bash
run: |
sudo apt-get update
sudo apt-get -y install clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev binutils coreutils desktop-file-utils fakeroot fuse libgdk-pixbuf2.0-dev patchelf python3-pip python3-setuptools squashfs-tools strace util-linux zsync
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'
- name: Install flutter
uses: subosito/flutter-action@v2
shell: bash
run: |
git submodule init
git submodule update
echo "$PWD/submodules/flutter/bin" >> $GITHUB_PATH
- name: Configure flutter
shell: bash
run: flutter config --no-analytics
- name: Build Android
shell: bash
run: bash build_android.sh
- name: Prepare releases
shell: bash
run: |
cd ..
mkdir build
cp Passy/build/app/outputs/flutter-apk/app-release.apk build/Passy-Android.apk
- name: Upload Android build
uses: actions/upload-artifact@v4
with:
flutter-version: '3.10.1'
channel: 'stable'
name: android
path: /home/runner/work/Passy/build/Passy-Android.apk
build_linux:
name: Build Passy for Linux
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install dependencies
shell: bash
run: |
sudo apt-get update
sudo apt-get -y install clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev binutils coreutils desktop-file-utils fakeroot fuse libgdk-pixbuf2.0-dev patchelf python3-pip python3-setuptools squashfs-tools strace util-linux zsync
- name: Install flutter
shell: bash
run: |
git submodule init
git submodule update
echo "$PWD/submodules/flutter/bin" >> $GITHUB_PATH
- name: Configure flutter
shell: bash
run: flutter config --no-analytics
- name: Build with updates popup
shell: bash
run: bash build_all_with_updates_popup.sh
run: echo "echo 3;echo y;echo;" | bash | bash build_all.sh
- name: Prepare releases
shell: bash
run: |
cd ..
mkdir -p build/linux-bundle/Passy
cp Passy/build/app/outputs/flutter-apk/app-release.apk build/Passy-Android.apk
cp -r Passy/build/linux/x64/release/bundle/. build/linux-bundle/Passy
cp Passy/build/appimage/Passy-Latest-x86_64.AppImage build
chmod +x build/linux-bundle/Passy/passy
Expand All @@ -53,31 +92,25 @@ jobs:
directory: ../build
filename: Passy-Linux-AppImage.zip
path: Passy-Latest-x86_64.AppImage
- name: Upload Android build
uses: actions/upload-artifact@v3
with:
name: android
path: /home/runner/work/Passy/build/Passy-Android.apk
- name: Upload Linux bundle build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux-bundle
path: /home/runner/work/Passy/build/linux-bundle/Passy-Linux-Bundle.zip
- name: Upload Linux AppImage build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux-appimage
path: /home/runner/work/Passy/build/Passy-Linux-AppImage.zip
- name: Build without updates popup
shell: bash
run: bash build_all_without_updates_popup.sh
run: echo "echo 3;echo n;echo;" | bash | bash build_all.sh
- name: Prepare releases
shell: bash
run: |
cd ..
rm -rf build/*
mkdir -p build/linux-bundle/Passy
cp Passy/build/app/outputs/flutter-apk/app-release.apk build/Passy-Android.apk
cp -r Passy/build/linux/x64/release/bundle/. build/linux-bundle/Passy
cp Passy/build/appimage/Passy-Latest-x86_64.AppImage build
chmod +x build/linux-bundle/Passy/passy
Expand All @@ -96,18 +129,13 @@ jobs:
directory: ../build
filename: Passy-Linux-AppImage.zip
path: Passy-Latest-x86_64.AppImage
- name: Upload Android no updates popup build
uses: actions/upload-artifact@v3
with:
name: android-no-updates-popup
path: /home/runner/work/Passy/build/Passy-Android.apk
- name: Upload Linux bundle no updates popup build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux-bundle-no-updates-popup
path: /home/runner/work/Passy/build/linux-bundle/Passy-Linux-Bundle.zip
- name: Upload Linux AppImage no updates popup build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux-appimage-no-updates-popup
path: /home/runner/work/Passy/build/Passy-Linux-AppImage.zip
Expand All @@ -116,26 +144,28 @@ jobs:
runs-on: windows-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install flutter
uses: subosito/flutter-action@v2
with:
flutter-version: '3.10.1'
channel: 'stable'
shell: bash
run: |
git submodule init
git submodule update
echo "$PWD/submodules/flutter/bin" >> $GITHUB_PATH
echo "$PWD/submodules/flutter/bin/cache/dart-sdk/bin" >> $GITHUB_PATH
- name: Configure flutter
shell: bash
run: flutter config --no-analytics
- name: Build Passy for Windows
shell: bash
run: ./build_windows_with_updates_popup.bat
run: flutter --no-version-check --suppress-analytics build windows
- name: Prepare releases
shell: bash
run: |
cd ..
mkdir -p build/windows-portable/Passy
cp -r Passy/build/windows/runner/Release/. build/windows-portable/Passy
cp -r Passy/build/windows/x64/runner/Release/. build/windows-portable/Passy
- name: Upload Windows portable build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: windows-portable
path: D:\a\Passy\build\windows-portable
48 changes: 48 additions & 0 deletions .github/workflows/build-linux-armv7-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Build Passy for Linux ARMv7
on:
workflow_dispatch:
pull_request:
types: [ opened, synchronize, reopened, review_requested ]
branches:
- main
- dev
jobs:
build_linux_armv7:
name: Build Passy CLI for Linux ARMv7
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/[email protected]
- name: Create build directory
shell: bash
run: |
cd ..
mkdir build
mkdir bin
cd bin
wget https://raw.githubusercontent.com/GlitterWare/Passy/$GITHUB_SHA/.github/workflows/armv7.sh
chmod +x armv7.sh
- name: Install dependencies
shell: bash
run: sudo apt install -y qemu binfmt-support qemu-user-static qemu-system-arm
- name: Build for ARMv7
uses: tj-actions/docker-run@v2
with:
image: ubuntu:latest
name: ubuntu
options: --rm --platform linux/arm/v7 -v $PWD:/Passy -v /home/runner/work/Passy/build:/passy-build -v /home/runner/work/Passy/bin:/passy-bin
args: /passy-bin/armv7.sh
- name: Archive Passy CLI build
uses: thedoctor0/[email protected]
with:
type: zip
directory: ../build
filename: Passy-CLI-Linux-ARMv7.zip
path: cli
- name: Upload Passy CLI build
uses: actions/upload-artifact@v4
with:
name: passy-cli-linux-armv7
path: /home/runner/work/Passy/build/Passy-CLI-Linux-ARMv7.zip
18 changes: 10 additions & 8 deletions .github/workflows/build-windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,28 @@ jobs:
runs-on: windows-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install flutter
uses: subosito/flutter-action@v2
with:
flutter-version: '3.10.1'
channel: 'stable'
shell: bash
run: |
git submodule init
git submodule update
echo "$PWD/submodules/flutter/bin" >> $GITHUB_PATH
echo "$PWD/submodules/flutter/bin/cache/dart-sdk/bin" >> $GITHUB_PATH
- name: Configure flutter
shell: bash
run: flutter config --no-analytics
- name: Build Passy for Windows
shell: bash
run: ./build_windows_with_updates_popup.bat
run: flutter --no-version-check --suppress-analytics build windows
- name: Prepare releases
shell: bash
run: |
cd ..
mkdir -p build/windows-portable/Passy
cp -r Passy/build/windows/runner/Release/. build/windows-portable/Passy
cp -r Passy/build/windows/x64/runner/Release/. build/windows-portable/Passy
- name: Upload Windows portable build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: windows-portable
path: D:\a\Passy\build\windows-portable
Loading

0 comments on commit 7fee2f6

Please sign in to comment.