diff --git a/.github/workflows/android-check.yaml b/.github/workflows/android-check.yaml index 55ae3f669..17a012c44 100644 --- a/.github/workflows/android-check.yaml +++ b/.github/workflows/android-check.yaml @@ -37,7 +37,7 @@ jobs: strategy: fail-fast: false matrix: - flavor: [WebDebug, FdroidDebug] + flavor: [WebBeta, FdroidDebug] include: - flavor: WebDebug arch: arm64 @@ -53,7 +53,19 @@ jobs: shell: bash run: | sudo apt-get update -y - sudo apt-get install -y ninja-build + sudo apt-get install -y ninja-build \ + qt6-base-dev \ + qt6-declarative-dev \ + qt6-positioning-dev \ + libqt6svg6-dev \ + optipng \ + libfreetype-dev \ + libharfbuzz-dev \ + libxrandr-dev \ + libxinerama-dev \ + libxcursor-dev \ + libxi-dev \ + zlib1g-dev - name: Checkout sources uses: actions/checkout@v4 @@ -68,11 +80,9 @@ jobs: shell: bash run: ./configure.sh - - name: Download MWM files + - name: Generate symbols shell: bash - run: | - wget https://cdn.comaps.app/maps/latest/World.mwm -P ./data/ - wget https://cdn.comaps.app/maps/latest/WorldCoasts.mwm -P ./data/ + run: ./tools/unix/generate_symbols.sh - name: Configure ccache uses: hendrikmuhs/ccache-action@v1.2 diff --git a/.github/workflows/ios-check.yaml b/.github/workflows/ios-check.yaml index ce9be5a05..83d89bbd7 100644 --- a/.github/workflows/ios-check.yaml +++ b/.github/workflows/ios-check.yaml @@ -14,7 +14,7 @@ jobs: LANG: en_US.UTF-8 # Fastlane complains that the terminal is using ASCII. LANGUAGE: en_US.UTF-8 LC_ALL: en_US.UTF-8 - TEST_RESULTS_BUNDLE_NAME: OMaps-Test-Results + TEST_RESULTS_BUNDLE_NAME: CoMaps-Test-Results strategy: fail-fast: false matrix: @@ -25,6 +25,12 @@ jobs: cancel-in-progress: true steps: + - name: Install dependencies + run: | + brew install qt \ + freetype \ + harfbuzz \ + optipng - name: Checkout sources uses: actions/checkout@v4 @@ -42,6 +48,10 @@ jobs: wget https://cdn.comaps.app/maps/latest/World.mwm -P ./data/ wget https://cdn.comaps.app/maps/latest/WorldCoasts.mwm -P ./data/ + - name: Generate symbols + shell: bash + run: ./tools/unix/generate_symbols.sh + - name: Configure XCode cache uses: irgaly/xcode-cache@v1 with: diff --git a/android/Dockerfile b/android/Dockerfile new file mode 100644 index 000000000..402903f05 --- /dev/null +++ b/android/Dockerfile @@ -0,0 +1,23 @@ +FROM ubuntu:latest + +ENV TZ=Etc/UTC +ENV QT_QPA_PLATFORM=offscreen + +RUN apt-get update && apt-get install -y --no-install-recommends \ + build-essential \ + cmake \ + qt6-base-dev \ + qt6-svg-dev \ + qt6-positioning-dev \ + libicu-dev \ + libfreetype-dev \ + libharfbuzz-dev \ + libxrandr-dev \ + libxinerama-dev \ + libxcursor-dev \ + libxi-dev \ + optipng +WORKDIR /root/comaps +RUN ./configure.sh +RUN ./tools/unix/generate_symbols.sh +CMD ./gradlew -Parm64 assembleFdroidDebug diff --git a/tools/unix/generate_symbols.sh b/tools/unix/generate_symbols.sh index a4947e1f4..e552e3b4c 100755 --- a/tools/unix/generate_symbols.sh +++ b/tools/unix/generate_symbols.sh @@ -17,6 +17,9 @@ fi # Prevent python from generating compiled *.pyc files export PYTHONDONTWRITEBYTECODE=1 +# Add env var to disable renderer on a display (renderer not working into a Github container) +export QT_QPA_PLATFORM=offscreen + OMIM_PATH="${OMIM_PATH:-$(cd "$(dirname "$0")/../.."; pwd)}" OUT_PATH="$OMIM_PATH/out/release" SKIN_GENERATOR="${SKIN_GENERATOR:-$OUT_PATH/skin_generator_tool}"