Browse Source

Merge pull request #379 from provokateurin/cleanup/building-app

tool: Cleanup building app
pull/386/head
Kate 1 year ago committed by GitHub
parent
commit
c7a386a32d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .github/workflows/publish.yaml
  2. 6
      tool/build-app.sh
  3. 2
      tool/build/linux.sh

2
.github/workflows/publish.yaml

@ -147,7 +147,7 @@ jobs:
# - name: Build # - name: Build
# env: # env:
# FLUTTER_VERSION: ${{ needs.setup.outputs.flutter_version }} # FLUTTER_VERSION: ${{ needs.setup.outputs.flutter_version }}
# run: ./tool/build-neon.sh linux/arm64 --build-number="${{ needs.setup.outputs.build_number }}" # run: ./tool/build-app.sh linux/arm64 --build-number="${{ needs.setup.outputs.build_number }}"
# #
# - uses: actions/upload-artifact@v3 # - uses: actions/upload-artifact@v3
# with: # with:

6
tool/build-neon.sh → tool/build-app.sh

@ -44,12 +44,8 @@ if [[ "$target" == "linux/arm64" ]] || [[ "$target" == "linux/amd64" ]]; then
-f "tool/build/Dockerfile.$os" \ -f "tool/build/Dockerfile.$os" \
./tool/build ./tool/build
paths=()
for path in packages/{app,file_icons,nextcloud,settings,sort_box} packages/neon/*; do
paths+=("$path/lib" "$path/pubspec.yaml")
done
run_args=() run_args=()
for path in ${paths[*]} "packages/file_icons/fonts" packages/neon/neon{,_files,_news,_notes,_notifications}/assets "packages/app/build" "packages/app/linux"; do for path in packages/{app,file_icons,nextcloud,settings,sort_box}/{lib,pubspec.yaml} packages/neon/*/{assets,lib,pubspec.yaml,pubspec_overrides.yaml} packages/file_icons/fonts packages/nextcloud/pubspec_overrides.yaml packages/app/{pubspec_overrides.yaml,assets,build,linux}; do
run_args+=(-v "$(pwd)/$path:/src/$path") run_args+=(-v "$(pwd)/$path:/src/$path")
done done
mkdir -p "packages/app/build" mkdir -p "packages/app/build"

2
tool/build/linux.sh

@ -2,7 +2,7 @@
set -euxo pipefail set -euxo pipefail
if [ ! -f /.dockerenv ]; then if [ ! -f /.dockerenv ]; then
echo "This script needs to run in a specific docker container, use the build-neon.sh script" echo "This script needs to run in a specific docker container, use the build-app.sh script"
exit 1 exit 1
fi fi

Loading…
Cancel
Save