remove nits

Signed-off-by: zyphlar <zyphlar@gmail.com>
This commit is contained in:
zyphlar
2026-01-15 11:01:01 -08:00
parent 6ee40d4414
commit 1c79bc5d28

View File

@@ -35,26 +35,6 @@ on:
- xcode/**
env:
APT_PACKAGES: >-
cmake
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
python3-pip
zlib1g-dev
git
ccache
openjdk-21-jdk
PIP_PACKAGES: protobuf<3.21
SUBMODULE_CACHE_PATHS: |
.git/modules
3party/CMake-MetalShaderSupport
@@ -87,57 +67,7 @@ jobs:
container:
image: codeberg.org/comaps/docker-android-sdk:latest
options: --user root
env:
JAVA_HOME: /usr/lib/jvm/java-21-openjdk-amd64
steps:
- name: Get date for cache key
id: date
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
- name: Create sudo wrapper
shell: bash
run: |
echo '#!/bin/bash' > /usr/local/bin/sudo
echo 'exec "$@"' >> /usr/local/bin/sudo
chmod +x /usr/local/bin/sudo
- name: Apt update
shell: bash
run: |
apt update -y
- name: Install and cache apt packages
uses: https://github.com/awalsh128/cache-apt-pkgs-action@v1.6.0
with:
packages: ${{ env.APT_PACKAGES }}
version: "${{ steps.date.outputs.date }}"
- name: Fallback manual apt install
shell: bash
run: apt install -y $APT_PACKAGES
- name: Generate pip cache key
id: pip-cache-key
run: echo "key=pip-$(echo '${{ env.PIP_PACKAGES }}' | md5sum | cut -d' ' -f1)" >> $GITHUB_OUTPUT
- name: Cache pip packages
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ steps.pip-cache-key.outputs.key }}
- name: Install build dependencies
shell: bash
run: |
pip install "${{ env.PIP_PACKAGES }}" --break-system-packages
update-alternatives --set java /usr/lib/jvm/java-21-openjdk-amd64/bin/java
- name: Install Android SDK components
shell: bash
run: |
yes | sdkmanager --licenses || true
sdkmanager "platforms;android-36" "build-tools;36.0.0" "ndk;28.2.13676358"
- name: Checkout sources
uses: actions/checkout@v4
with:
@@ -166,9 +96,9 @@ jobs:
shell: bash
working-directory: android
run: |
cd ..
./configure.sh
cd android
# cd ..
# ./configure.sh
# cd android
./gradlew -Pandroidauto=true lint
android-check:
@@ -177,8 +107,6 @@ jobs:
container:
image: codeberg.org/comaps/docker-android-sdk:latest
options: --user root
env:
JAVA_HOME: /usr/lib/jvm/java-21-openjdk-amd64
strategy:
fail-fast: false
matrix:
@@ -194,54 +122,6 @@ jobs:
cancel-in-progress: true
steps:
- name: Get date for cache key
id: date
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
- name: Create sudo wrapper
shell: bash
run: |
echo '#!/bin/bash' > /usr/local/bin/sudo
echo 'exec "$@"' >> /usr/local/bin/sudo
chmod +x /usr/local/bin/sudo
- name: Apt update
shell: bash
run: |
apt update -y
- name: Install and cache apt packages
uses: https://github.com/awalsh128/cache-apt-pkgs-action@v1.6.0
with:
packages: ${{ env.APT_PACKAGES }}
version: "${{ steps.date.outputs.date }}"
- name: Fallback manual apt install
shell: bash
run: apt install -y $APT_PACKAGES
- name: Generate pip cache key
id: pip-cache-key
run: echo "key=pip-$(echo '${{ env.PIP_PACKAGES }}' | md5sum | cut -d' ' -f1)" >> $GITHUB_OUTPUT
- name: Cache pip packages
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ steps.pip-cache-key.outputs.key }}
- name: Install build dependencies
shell: bash
run: |
pip install "${{ env.PIP_PACKAGES }}" --break-system-packages
update-alternatives --set java /usr/lib/jvm/java-21-openjdk-amd64/bin/java
- name: Install Android SDK components
shell: bash
run: |
yes | sdkmanager --licenses || true
sdkmanager "platforms;android-36" "build-tools;36.0.0" "ndk;28.2.13676358"
- name: Checkout sources
uses: actions/checkout@v4
with:
@@ -283,17 +163,9 @@ jobs:
cd android
./gradlew -P${{ matrix.arch }} assemble${{ matrix.flavor }}
- name: Find built APK
id: find-apk
shell: bash
run: |
APK_PATH=$(find android/app/build/outputs/apk/**/ -name "*.apk" -type f | head -n 1)
echo "apk_path=$APK_PATH" >> $GITHUB_OUTPUT
echo "Found APK: $APK_PATH"
- name: Upload ${{ matrix.flavor }} apk
uses: actions/upload-artifact@v3
with:
name: android-${{ matrix.flavor }}
path: ${{ steps.find-apk.outputs.apk_path }}
path: android/app/build/outputs/apk/**/*.apk
if-no-files-found: error