From ffb8907f6f08ab40dde09a63db7f6b0e593edd12 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Sun, 16 Apr 2023 20:04:44 +0200 Subject: [PATCH] Fix paths after packages refactoring --- .github/workflows/publish.yaml | 16 ++++++++-------- tool/build-neon.sh | 4 ++-- tool/cloc.sh | 2 +- tool/generate-neon.sh | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index ceada455..894a667d 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -61,11 +61,11 @@ jobs: java-version: 11 - name: Build - run: cd packages/neon && flutter build apk --split-per-abi --build-number="${{ needs.setup.outputs.build_number }}" + run: cd packages/app && flutter build apk --split-per-abi --build-number="${{ needs.setup.outputs.build_number }}" - uses: ilharp/sign-android-release@v1 name: Sign with: - releaseDir: packages/neon/build/app/outputs/flutter-apk + releaseDir: packages/app/build/app/outputs/flutter-apk signingKey: ${{ secrets.SIGNING_KEY }} keyAlias: ${{ secrets.ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} @@ -74,17 +74,17 @@ jobs: - uses: actions/upload-artifact@v3 with: name: Android arm64-v8a - path: packages/neon/build/app/outputs/flutter-apk/app-arm64-v8a-release-signed.apk + path: packages/app/build/app/outputs/flutter-apk/app-arm64-v8a-release-signed.apk if-no-files-found: error - uses: actions/upload-artifact@v3 with: name: Android armeabi-v7a - path: packages/neon/build/app/outputs/flutter-apk/app-armeabi-v7a-release-signed.apk + path: packages/app/build/app/outputs/flutter-apk/app-armeabi-v7a-release-signed.apk if-no-files-found: error - uses: actions/upload-artifact@v3 with: name: Android x86_64 - path: packages/neon/build/app/outputs/flutter-apk/app-x86_64-release-signed.apk + path: packages/app/build/app/outputs/flutter-apk/app-x86_64-release-signed.apk if-no-files-found: error linux_x86_64: @@ -114,12 +114,12 @@ jobs: libappindicator3-dev - name: Build - run: cd packages/neon && flutter build linux --build-number="${{ needs.setup.outputs.build_number }}" + run: cd packages/app && flutter build linux --build-number="${{ needs.setup.outputs.build_number }}" - uses: actions/upload-artifact@v3 with: name: Linux x86_64 - path: packages/neon/build/linux/x64/release/bundle/* + path: packages/app/build/linux/x64/release/bundle/* if-no-files-found: error # linux_arm64: @@ -152,5 +152,5 @@ jobs: # - uses: actions/upload-artifact@v3 # with: # name: Linux arm64 -# path: packages/neon/build/linux/arm64/release/bundle/* +# path: packages/app/build/linux/arm64/release/bundle/* # if-no-files-found: error diff --git a/tool/build-neon.sh b/tool/build-neon.sh index fab4806c..2710bda6 100755 --- a/tool/build-neon.sh +++ b/tool/build-neon.sh @@ -45,11 +45,11 @@ if [[ "$target" == "linux/arm64" ]] || [[ "$target" == "linux/amd64" ]]; then ./tool/build paths=() - for path in packages/*; do + for path in packages/{app,file_icons,nextcloud,settings,sort_box} packages/neon/*; do paths+=("$path/lib" "$path/pubspec.yaml") done run_args=() - for path in ${paths[*]} "packages/file_icons/fonts" packages/neon{,_files,_news,_notes,_notifications}/assets "packages/app/build" "packages/app/linux"; do + for path in ${paths[*]} "packages/file_icons/fonts" packages/neon/neon{,_files,_news,_notes,_notifications}/assets "packages/app/build" "packages/app/linux"; do run_args+=(-v "$(pwd)/$path:/src/$path") done mkdir -p "packages/app/build" diff --git a/tool/cloc.sh b/tool/cloc.sh index 108c5915..ab57384b 100755 --- a/tool/cloc.sh +++ b/tool/cloc.sh @@ -4,6 +4,6 @@ cd "$(dirname "$0")/.." cloc \ --fullpath \ - --not-match-d="(./external|./specs/templates|./packages/.*/.idea|./packages/.*/build|./packages/.*/coverage|./packages/.*/.dart_tool|./packages/neon/linux/flutter/ephemeral|./packages/nextcloud/doc)" \ + --not-match-d="(./external|./specs/templates|./packages/.*/.idea|./packages/.*/build|./packages/.*/coverage|./packages/.*/.dart_tool|./packages/app/linux/flutter/ephemeral|./packages/nextcloud/doc)" \ --exclude-ext="g.dart" --exclude-ext="openapi.dart" \ . diff --git a/tool/generate-neon.sh b/tool/generate-neon.sh index ab006379..12c64d43 100755 --- a/tool/generate-neon.sh +++ b/tool/generate-neon.sh @@ -26,7 +26,7 @@ function export_mipmap_icon_all() { function copy_nextcloud_app_svg() { id="$1" path="$2" - target="packages/neon_$id/assets/app.svg" + target="packages/neon/neon_$id/assets/app.svg" if [ -f "$path/img/app.svg" ]; then cp "$path/img/app.svg" "$target" elif [ -f "$path/img/$id.svg" ]; then @@ -47,7 +47,7 @@ copy_nextcloud_app_svg notes external/nextcloud-notes copy_nextcloud_app_svg notifications external/nextcloud-notifications ( - cd packages/neon + cd packages/neon/neon # Nextcloud logo wget https://raw.githubusercontent.com/nextcloud/promo/master/nextcloud-logo-inverted.svg -O assets/logo_nextcloud.svg @@ -69,9 +69,9 @@ copy_nextcloud_app_svg notifications external/nextcloud-notifications exiftool -overwrite_original -all= img/splash_icon_android_12.png # To remove timestamps # Android launcher icons - export_mipmap_icon_all "../neon/assets/logo_neon.svg" "ic_launcher" & + export_mipmap_icon_all "../neon/neon/assets/logo_neon.svg" "ic_launcher" & for id in files news notes notifications; do - export_mipmap_icon_all "../neon_$id/assets/app.svg" "app_$id" & + export_mipmap_icon_all "../neon/neon_$id/assets/app.svg" "app_$id" & done wait