Skip to content

Commit 09ea275

Browse files
CodeDoctorDECodeDoctorDE
committed
Fix ci
1 parent 20930f0 commit 09ea275

File tree

5 files changed

+12
-216
lines changed

5 files changed

+12
-216
lines changed

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 152 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,6 @@ jobs:
3333
flutter clean
3434
flutter pub get
3535
flutter doctor -v
36-
- name: Build nessesary files
37-
working-directory: ./
38-
run: |
39-
cd tools
40-
dart pub get
41-
cd ..
42-
dart run tools/generate.dart
4336
- name: Import files
4437
if: ${{ github.event_name != 'pull_request' }}
4538
env:
@@ -116,13 +109,6 @@ jobs:
116109
flutter clean
117110
flutter pub get
118111
flutter doctor -v
119-
- name: Build nessesary files
120-
working-directory: ./
121-
run: |
122-
cd tools
123-
dart pub get
124-
cd ..
125-
dart run tools/generate.dart
126112
- name: 🏭 Build nightly
127113
if: ${{ github.ref != 'refs/tags/stable' && (github.event_name != 'release' || github.event.release.prerelease) }}
128114
run: |
@@ -213,13 +199,6 @@ jobs:
213199
flutter clean
214200
flutter doctor -v
215201
flutter pub get
216-
- name: Build nessesary files
217-
working-directory: ./
218-
run: |
219-
cd tools
220-
dart pub get
221-
cd ..
222-
dart run tools/generate.dart
223202
- name: 🏭 Build nightly
224203
if: ${{ github.ref != 'refs/tags/stable' && (github.event_name != 'release' || github.event.release.prerelease) }}
225204
run: |
@@ -254,7 +233,7 @@ jobs:
254233
appimage-builder --recipe AppImageBuilder.yml --skip-test
255234
- name: Copy nessessary files
256235
run: |
257-
cp assets/images/logo.svg build/linux/${{ matrix.arch.dir }}/release/bundle/dev.linwood.vulpine.svg
236+
cp images/logo.svg build/linux/${{ matrix.arch.dir }}/release/bundle/dev.linwood.vulpine.svg
258237
mkdir -p build/linux/${{ matrix.arch.dir }}/release/bundle/usr/share
259238
cp -r linux/debian/usr/share build/linux/${{ matrix.arch.dir }}/release/bundle/usr
260239
- name: Rename AppImage
@@ -349,13 +328,6 @@ jobs:
349328
flutter clean
350329
flutter pub get
351330
flutter doctor -v
352-
- name: Build nessesary files
353-
working-directory: ./
354-
run: |
355-
cd tools
356-
dart pub get
357-
cd ..
358-
dart run tools/generate.dart
359331
- name: 🏭 Build nightly
360332
if: ${{ github.ref != 'refs/tags/stable' && (github.event_name != 'release' || github.event.release.prerelease) }}
361333
run: |
@@ -368,7 +340,7 @@ jobs:
368340
flutter build linux -v --release --dart-define=flavor=production
369341
- name: Copy nessessary files
370342
run: |
371-
cp assets/images/logo.svg build/linux/${{ matrix.arch.dir }}/release/bundle/dev.linwood.vulpine.svg
343+
cp images/logo.svg build/linux/${{ matrix.arch.dir }}/release/bundle/dev.linwood.vulpine.svg
372344
mkdir -p build/linux/${{ matrix.arch.dir }}/release/bundle/usr/share
373345
cp -r linux/debian/usr/share build/linux/${{ matrix.arch.dir }}/release/bundle/usr
374346
- name: Compress Flutter build
@@ -387,7 +359,7 @@ jobs:
387359
# flatpak run org.flatpak.Builder -v --force-clean --sandbox --delete-build-dirs --user --install-deps-from=flathub --arch=x86_64 flatpak_app flatpak.json --bundle-sources
388360
# flatpak build-export export flatpak_app -v
389361
# flatpak build-bundle export linwood-vulpine-linux.flatpak dev.linwood.vulpine -v
390-
# - name: Upload .flatpak artifact to workflow
362+
# - name: Upload .flatpak artifact to workvulpine
391363
# uses: actions/upload-artifact@v4
392364
# with:
393365
# name: linux-flatpak
@@ -418,13 +390,6 @@ jobs:
418390
flutter clean
419391
flutter pub get
420392
flutter doctor -v
421-
- name: Build nessesary files
422-
working-directory: ./
423-
run: |
424-
cd tools
425-
dart pub get
426-
cd ..
427-
dart run tools/generate.dart
428393
- name: 🏭 Build
429394
run: |
430395
flutter build macos -v --release
@@ -472,13 +437,6 @@ jobs:
472437
flutter clean
473438
flutter pub get
474439
flutter doctor -v
475-
- name: Build nessesary files
476-
working-directory: ./
477-
run: |
478-
cd tools
479-
dart pub get
480-
cd ..
481-
dart run tools/generate.dart
482440
- name: 🏭 Build
483441
run: |
484442
flutter build ios --release --no-codesign -v
@@ -518,73 +476,6 @@ jobs:
518476
# with:
519477
# name: vulpine-snap
520478
# path: ${{ steps.build.outputs.snap }}
521-
build-server:
522-
defaults:
523-
run:
524-
working-directory: server
525-
strategy:
526-
matrix:
527-
os:
528-
- name: ubuntu-24.04
529-
label: linux-x86_64
530-
rust: libvulpine_plugin.so
531-
- name: ubuntu-24.04-arm
532-
label: linux-arm64
533-
rust: libvulpine_plugin.so
534-
- name: windows-2025
535-
label: windows-x86_64
536-
rust: vulpine_plugin.dll
537-
- name: macos-latest
538-
label: macos
539-
rust: libvulpine_plugin.dylib
540-
runs-on: ${{ matrix.os.name }}
541-
steps:
542-
- name: ⬆️ Checkout
543-
uses: actions/checkout@v4
544-
- name: Install yq
545-
if: ${{ matrix.os.name == 'windows-2025' }}
546-
run: choco install yq
547-
- uses: subosito/[email protected]
548-
with:
549-
flutter-version-file: app/pubspec.yaml
550-
channel: 'master'
551-
cache: true
552-
cache-key: 'flutter-:os:-:channel:-:version:-:arch:-:hash:'
553-
cache-path: '${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:'
554-
- name: 📦 Get dependencies
555-
run: |
556-
flutter clean
557-
flutter pub get
558-
flutter doctor -v
559-
- name: Compile rust
560-
working-directory: plugin/rust
561-
run: |
562-
cargo build --release
563-
- name: Compile
564-
run: |
565-
dart compile exe bin/vulpine_server.dart
566-
- name: Create directory
567-
run: |
568-
mkdir -p server-build
569-
mv bin/vulpine_server.exe server-build/
570-
mkdir -p server-build/packs
571-
- name: Move rust lib
572-
working-directory: ./
573-
run: |
574-
cp plugin/rust/target/release/${{ matrix.os.rust }} server/server-build/
575-
- name: Build nessesary files
576-
working-directory: ./
577-
run: |
578-
cd tools
579-
dart pub get
580-
cd ..
581-
dart run tools/generate.dart
582-
cp app/assets/pack.stnx server/server-build/packs/.stnx
583-
- name: Archive
584-
uses: actions/upload-artifact@v4
585-
with:
586-
name: server-build-${{ matrix.os.label }}
587-
path: server/server-build
588479
deploy:
589480
runs-on: ubuntu-24.04
590481
if: github.event_name != 'pull_request'
@@ -598,7 +489,6 @@ jobs:
598489
- build-flatpak
599490
- build-macos
600491
- build-ipa
601-
- build-server
602492
steps:
603493
- name: ⬆️ Checkout
604494
uses: actions/checkout@v4
@@ -678,35 +568,15 @@ jobs:
678568
- uses: actions/download-artifact@v4
679569
with:
680570
name: ipa-build
681-
- uses: actions/download-artifact@v4
682-
with:
683-
name: server-build-linux-x86_64
684-
path: server-build-linux-x86_64/
685-
- uses: actions/download-artifact@v4
686-
with:
687-
name: server-build-linux-arm64
688-
path: server-build-linux-arm64/
689-
- uses: actions/download-artifact@v4
690-
with:
691-
name: server-build-windows-x86_64
692-
path: server-build-windows-x86_64/
693-
- uses: actions/download-artifact@v4
694-
with:
695-
name: server-build-macos
696-
path: server-build-macos/
697571
- name: 📦 Zip artifacts
698572
run: |
699573
cd windows-build
700574
zip -r ../linwood-vulpine-windows-x86_64.zip *
701575
cd ..
702576
tar -C linux-x86_64-build -czf linwood-vulpine-linux-x86_64.tar.gz .
703577
tar -C linux-arm64-build -czf linwood-vulpine-linux-arm64.tar.gz .
704-
zip -r linwood-vulpine-server-windows-x86_64.zip server-build-windows-x86_64/*
705578
tar -C linux-x86_64-alternative-build -czf linwood-vulpine-linux-alternative-x86_64.tar.gz .
706579
tar -C linux-arm64-alternative-build -czf linwood-vulpine-linux-alternative-arm64.tar.gz .
707-
tar -C server-build-linux-x86_64 -czf linwood-vulpine-server-linux-x86_64.tar.gz .
708-
tar -C server-build-linux-arm64 -czf linwood-vulpine-server-linux-arm64.tar.gz .
709-
zip -r linwood-vulpine-server-macos.zip server-build-macos/*
710580
- name: Configure git
711581
if: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main' }}
712582
run: |
@@ -757,10 +627,6 @@ jobs:
757627
linwood-vulpine-android-arm64.apk
758628
linwood-vulpine-android-x86_64.apk
759629
linwood-vulpine-ios.ipa
760-
linwood-vulpine-server-linux-x86_64.tar.gz
761-
linwood-vulpine-server-linux-arm64.tar.gz
762-
linwood-vulpine-server-windows-x86_64.zip
763-
linwood-vulpine-server-macos.zip
764630
checksums.txt
765631
env:
766632
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -790,10 +656,6 @@ jobs:
790656
linwood-vulpine-android-arm64.apk
791657
linwood-vulpine-android-x86_64.apk
792658
linwood-vulpine-ios.ipa
793-
linwood-vulpine-server-linux-x86_64.tar.gz
794-
linwood-vulpine-server-linux-arm64.tar.gz
795-
linwood-vulpine-server-windows-x86_64.zip
796-
linwood-vulpine-server-macos.zip
797659
checksums.txt
798660
env:
799661
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -821,10 +683,6 @@ jobs:
821683
linwood-vulpine-android-arm64.apk
822684
linwood-vulpine-android-x86_64.apk
823685
linwood-vulpine-ios.ipa
824-
linwood-vulpine-server-linux-x86_64.tar.gz
825-
linwood-vulpine-server-linux-arm64.tar.gz
826-
linwood-vulpine-server-windows-x86_64.zip
827-
linwood-vulpine-server-macos.zip
828686
checksums.txt
829687
env:
830688
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -864,13 +722,6 @@ jobs:
864722
- uses: subosito/[email protected]
865723
with:
866724
flutter-version-file: app/pubspec.yaml
867-
- name: Build nessesary files
868-
working-directory: ./
869-
run: |
870-
cd tools
871-
dart pub get
872-
cd ..
873-
dart run tools/generate.dart
874725
- name: 📦 Get dependencies
875726
run: |
876727
flutter pub get

‎.github/workflows/compress-images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Compress Images
44
on:
55
workflow_dispatch:
66
schedule:
7-
- cron: '00 23 * * 0'
7+
- cron: "00 23 * * 0"
88
jobs:
99
build:
1010
name: calibreapp/image-actions

‎.github/workflows/dart.yml‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
continue-on-error: true
99
strategy:
1010
matrix:
11-
projects: [app, api, plugin, server, tools]
11+
projects: [app, api, tools]
1212
defaults:
1313
run:
1414
working-directory: ${{ matrix.projects }}
@@ -23,13 +23,6 @@ jobs:
2323
run: |
2424
dart --version
2525
flutter --version
26-
- name: Run generate
27-
working-directory: ./
28-
run: |
29-
cd tools
30-
dart pub get
31-
cd ..
32-
dart run tools/generate.dart
3326
- name: Install dependencies
3427
run: |
3528
flutter pub get
@@ -38,27 +31,15 @@ jobs:
3831
run: |
3932
flutter gen-l10n
4033
dart format lib/src/generated
41-
- name: Install app specific dependencies
42-
if: matrix.projects == 'app'
43-
run: |
44-
cd rust_builder
45-
flutter pub get
46-
cd cargokit/build_tool
47-
flutter pub get
4834
# Uncomment this step to verify the use of 'dart format' on each commit.
4935
- name: Verify formatting
5036
run: dart format --output=none --set-exit-if-changed .
5137
# Consider passing '--fatal-infos' for slightly stricter analysis.
5238
- name: Analyze project source
5339
run: |
5440
flutter analyze --fatal-infos
55-
- name: Build flutter_rust_bridge bindings
56-
if: matrix.projects == 'plugin'
57-
run: |
58-
cargo install [email protected]
59-
flutter_rust_bridge_codegen generate
6041
- name: Run build_runner
61-
if: matrix.projects == 'api' || matrix.projects == 'app'
42+
if: matrix.projects != 'tools'
6243
run: dart run build_runner build --delete-conflicting-outputs
6344
- name: Test for git changes
6445
run: git diff --exit-code

‎.github/workflows/deploy.yml‎

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -41,37 +41,7 @@ jobs:
4141
chmod 600 sftp_key
4242
echo "$SFTP_KNOWN_HOSTS" > known_hosts
4343
chmod 600 known_hosts
44-
rsync -avz --delete -e "ssh -i sftp_key -o UserKnownHostsFile=known_hosts" dist/ $SFTP_USERNAME@$SFTP_HOST:/var/www/www.vulpine
45-
doc:
46-
runs-on: ubuntu-24.04
47-
defaults:
48-
run:
49-
working-directory: server
50-
steps:
51-
- name: ⬆️ Checkout
52-
uses: actions/checkout@v4
53-
- uses: subosito/[email protected]
54-
with:
55-
flutter-version-file: app/pubspec.yaml
56-
- name: Install dependencies
57-
run: |
58-
flutter pub get
59-
- name: Generate documentation
60-
run: |
61-
dart doc
62-
- name: Deploy to SFTP
63-
if: github.ref == 'refs/heads/develop'
64-
env:
65-
SFTP_HOST: ${{ secrets.SFTP_HOST }}
66-
SFTP_USERNAME: ${{ secrets.SFTP_USERNAME }}
67-
SFTP_KEY: ${{ secrets.SFTP_KEY }}
68-
SFTP_KNOWN_HOSTS: ${{secrets.SFTP_KNOWN_HOSTS}}
69-
run: |
70-
echo "$SFTP_KEY" > sftp_key
71-
chmod 600 sftp_key
72-
echo "$SFTP_KNOWN_HOSTS" > known_hosts
73-
chmod 600 known_hosts
74-
rsync -avz --delete -e "ssh -i sftp_key -o UserKnownHostsFile=known_hosts" doc/api/ $SFTP_USERNAME@$SFTP_HOST:/var/www/api.vulpine
44+
rsync -avz --delete -e "ssh -i sftp_key -o UserKnownHostsFile=known_hosts" dist/ $SFTP_USERNAME@$SFTP_HOST:/var/www/vulpine.linwood
7545
web:
7646
runs-on: ubuntu-24.04
7747
defaults:
@@ -86,12 +56,6 @@ jobs:
8656
- name: Install dependencies
8757
run: |
8858
flutter pub get
89-
- name: Generate
90-
run: |
91-
cd ../tools
92-
dart pub get
93-
cd ..
94-
dart run tools/generate.dart
9559
- name: Set flavor
9660
if: github.ref != 'refs/heads/main'
9761
run: |
@@ -116,4 +80,4 @@ jobs:
11680
chmod 600 sftp_key
11781
echo "$SFTP_KNOWN_HOSTS" > known_hosts
11882
chmod 600 known_hosts
119-
rsync -avz --delete -e "ssh -i sftp_key -o UserKnownHostsFile=known_hosts" build/web/ $SFTP_USERNAME@$SFTP_HOST:/var/www/$WEB_DIR.vulpine
83+
rsync -avz --delete -e "ssh -i sftp_key -o UserKnownHostsFile=known_hosts" build/web/ $SFTP_USERNAME@$SFTP_HOST:/var/www/$WEB_DIR.vulpine.linwood

0 commit comments

Comments
 (0)