jonah/fluffychat
1
0 Fork 0
mirror of https://github.com/krille-chan/fluffychat.git synced 2026-10-16 04:56:46 +02:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

build: use fvm instead of .tool_versions.yaml file

Browse Source
This commit is contained in:
Christian Kußowski committed 2026-10-15 08:21:04 +02:00
1 parent c51b2ada81
commit a0e0f15236
10 files changed
+38 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.fvmrc
+3
View File
@@ -0,0 +1,3 @@
{
"flutter": "3.47.7"
}
.github/workflows/integrate.yaml
+9 -9
View File
@@ -16,7 +16,7 @@ jobs:
- run: git diff --exit-code
- uses: subosito/flutter-action@v2
with:
flutter-version-file: .tool_versions.yaml
flutter-version-file: .fvmrc
cache: true
- uses: dtolnay/rust-toolchain@stable
- name: Check for empty translations
@@ -62,7 +62,7 @@ jobs:
- uses: actions/checkout@v7
- uses: subosito/flutter-action@v2
with:
flutter-version-file: .tool_versions.yaml
flutter-version-file: .fvmrc
cache: true
- uses: dtolnay/rust-toolchain@stable
- run: flutter pub get
@@ -77,7 +77,7 @@ jobs:
- uses: ./.github/actions/free_up_space
- uses: subosito/flutter-action@v2
with:
flutter-version-file: .tool_versions.yaml
flutter-version-file: .fvmrc
cache: true
- uses: dtolnay/rust-toolchain@stable
- name: Cache Gradle
@@ -103,7 +103,7 @@ jobs:
- uses: actions/checkout@v7
- uses: subosito/flutter-action@v2
with:
flutter-version-file: .tool_versions.yaml
flutter-version-file: .fvmrc
cache: true
- uses: dtolnay/rust-toolchain@stable
- run: rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
@@ -128,7 +128,7 @@ jobs:
- uses: actions/checkout@v7
- name: Install dependencies
run: sudo apt-get update && sudo apt-get install git wget 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 libpulse-dev -y
- run: echo "FLUTTER_VERSION=$(yq '.environment.flutter' < .tool_versions.yaml)" >> $GITHUB_ENV
- run: echo "FLUTTER_VERSION=$(yq '.flutter' < .fvmrc)" >> $GITHUB_ENV
- name: Install Flutter
run: |
git clone --branch ${{ env.FLUTTER_VERSION }} https://github.com/flutter/flutter.git
@@ -144,7 +144,7 @@ jobs:
- uses: actions/checkout@v7
- uses: subosito/flutter-action@v2
with:
flutter-version-file: .tool_versions.yaml
flutter-version-file: .fvmrc
cache: true
- name: Use specific XCode version
run: sudo xcode-select --switch /Applications/Xcode_26.3.app
@@ -160,7 +160,7 @@ jobs:
- uses: actions/checkout@v7
- uses: subosito/flutter-action@v2
with:
flutter-version-file: .tool_versions.yaml
flutter-version-file: .fvmrc
cache: true
- name: Use specific XCode version
run: sudo xcode-select --switch /Applications/Xcode_26.3.app
@@ -183,7 +183,7 @@ jobs:
- uses: actions/checkout@v7
- uses: subosito/flutter-action@v2
with:
flutter-version-file: .tool_versions.yaml
flutter-version-file: .fvmrc
cache: true
- uses: dtolnay/rust-toolchain@stable
- run: choco install innosetup -y
@@ -253,7 +253,7 @@ jobs:
echo "Generated AVD snapshot for caching."
- uses: subosito/flutter-action@v2
with:
flutter-version-file: .tool_versions.yaml
flutter-version-file: .fvmrc
cache: true
- uses: dtolnay/rust-toolchain@stable
- name: Cache Gradle
.github/workflows/main_deploy.yaml
+2 -2
View File
@@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v7
- uses: subosito/flutter-action@v2
with:
flutter-version-file: .tool_versions.yaml
flutter-version-file: .fvmrc
- uses: dtolnay/rust-toolchain@stable
- run: rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
- name: Prepare web
@@ -56,7 +56,7 @@ jobs:
- uses: actions/checkout@v7
- uses: subosito/flutter-action@v2
with:
flutter-version-file: .tool_versions.yaml
flutter-version-file: .fvmrc
cache: true
- name: Set up Ruby
uses: ruby/setup-ruby@v1
.github/workflows/release.yaml
+5 -5
View File
@@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v7
- uses: subosito/flutter-action@v2
with:
flutter-version-file: .tool_versions.yaml
flutter-version-file: .fvmrc
cache: true
- uses: dtolnay/rust-toolchain@stable
- run: rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
@@ -75,7 +75,7 @@ jobs:
- uses: actions/checkout@v7
- uses: subosito/flutter-action@v2
with:
flutter-version-file: .tool_versions.yaml
flutter-version-file: .fvmrc
cache: true
- name: Add Firebase Messaging
run: |
@@ -110,7 +110,7 @@ jobs:
- uses: actions/checkout@v7
- 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 libwebkit2gtk-4.1-dev -y
- run: echo "FLUTTER_VERSION=$(yq '.environment.flutter' < .tool_versions.yaml)" >> $GITHUB_ENV
- run: echo "FLUTTER_VERSION=$(yq '.flutter' < .fvmrc)" >> $GITHUB_ENV
- name: Install Flutter
run: |
git clone --branch ${{ env.FLUTTER_VERSION }} https://github.com/flutter/flutter.git
@@ -160,7 +160,7 @@ jobs:
- uses: actions/checkout@v7
- uses: subosito/flutter-action@v2
with:
flutter-version-file: .tool_versions.yaml
flutter-version-file: .fvmrc
cache: true
- uses: dtolnay/rust-toolchain@stable
- run: choco install innosetup -y
@@ -186,7 +186,7 @@ jobs:
- uses: actions/checkout@v7
- uses: subosito/flutter-action@v2
with:
flutter-version-file: .tool_versions.yaml
flutter-version-file: .fvmrc
cache: true
- name: Set up Ruby
uses: ruby/setup-ruby@v1
.gitignore
+4 -2
View File
@@ -172,7 +172,6 @@ app.*.symbols
.agents/skills/personal-*
/.agent-shell/
# +++++++++ Custom +++++++++
# Web
@@ -204,4 +203,7 @@ web/e2ee.worker.dart.js
web/e2ee.worker.dart.js.deps
web/e2ee.worker.dart.js.map
test/rust
test/rust
# FVM Version Cache
.fvm/
.tool_versions.yaml
-2
View File
@@ -1,2 +0,0 @@
environment:
flutter: 3.47.4 # Keep in sync with snap/snapcraft.yaml
.vscode/settings.json
Vendored
+6 -5
View File
@@ -1,7 +1,8 @@
{
"[dart]": {
"editor.codeActionsOnSave": [
"source.organizeImports"
]
}
"[dart]": {
"editor.codeActionsOnSave": [
"source.organizeImports"
]
},
"dart.flutterSdkPath": ".fvm/versions/3.47.7"
}
Dockerfile
+3 -3
View File
@@ -12,10 +12,10 @@ RUN wget https://github.com/mikefarah/yq/releases/download/v4.40.5/yq_linux_${TA
RUN tar -xzvf ./yq_linux_${TARGETARCH}.tar.gz
RUN mv yq_linux_${TARGETARCH} /usr/bin/yq
# Install the Flutter version defined in .tool_versions.yaml
# Install the Flutter version defined in .fvmrc
WORKDIR /app
COPY .tool_versions.yaml /app/
RUN git clone --depth 1 --branch "$(yq '.environment.flutter' .tool_versions.yaml)" \
COPY .fvmrc /app/
RUN git clone --depth 1 --branch "$(yq '.flutter' .fvmrc)" \
https://github.com/flutter/flutter.git /opt/flutter
ENV PATH="/opt/flutter/bin:${PATH}"
RUN flutter precache --web
REUSE.toml
+1 -1
View File
@@ -8,7 +8,7 @@ version = 1
[[annotations]]
path = [
".mailmap",
".tool_versions.yaml",
".fvmrc",
"pubspec.lock",
"*.json",
".vscode/**",
snap/snapcraft.yaml
+5 -5
View File
@@ -56,16 +56,14 @@ platforms:
parts:
flutter-git:
source: https://github.com/flutter/flutter.git
source-tag: 3.47.4
source-depth: 1
source: .
plugin: nil
override-build: |
mkdir -p $CRAFT_PART_INSTALL/usr/bin
mkdir -p $CRAFT_PART_INSTALL/usr/libexec
cp -r $CRAFT_PART_SRC $CRAFT_PART_INSTALL/usr/libexec/flutter
git clone --depth 1 --branch "$(jq -r .flutter .fvmrc)" https://github.com/flutter/flutter.git $CRAFT_PART_INSTALL/usr/libexec/flutter
ln -s $CRAFT_PART_INSTALL/usr/libexec/flutter/bin/flutter $CRAFT_PART_INSTALL/usr/bin/flutter
ln -s $SNAPCRAFT_PART_INSTALL/usr/libexec/flutter/bin/dart $SNAPCRAFT_PART_INSTALL/usr/bin/dart
ln -s $CRAFT_PART_INSTALL/usr/libexec/flutter/bin/dart $SNAPCRAFT_PART_INSTALL/usr/bin/dart
$CRAFT_PART_INSTALL/usr/bin/flutter doctor
build-packages:
- clang
@@ -75,6 +73,8 @@ parts:
- ninja-build
- unzip
- xz-utils
- git
- jq
- zip
- lld
- llvm-18