chore: update the file

This commit is contained in:
x-tools-author 2025-04-25 16:33:20 +08:00
parent bb65e22e84
commit 3cae8a054d
3 changed files with 8 additions and 28 deletions

View File

@ -1,26 +0,0 @@
name: build-docker-android
on:
workflow_dispatch: # Enables manually
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
jobs:
build:
name: Build
runs-on: ubuntu-latest
env:
CR_PAT: ${{ secrets.CR_PAT }}
QT_MODULES: 'qtcharts qtserialbus qtserialport qtwebsockets'
steps:
- name: checkout
uses: actions/checkout@v4
- name: build docker image
run: |
docker build -t x-tools-ubuntu-20.04:android-armv7 . -f docker/20.04-android/Dockerfile
- name: push docker image to github registry
run: |
echo ${{ env.CR_PAT }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
docker rmi ghcr.io/x-tools-author/x-tools-ubuntu-20.04:android-armv7 || true
docker tag x-tools-ubuntu-20.04:android-armv7 ghcr.io/x-tools-author/x-tools-ubuntu-20.04:android-armv7
docker push ghcr.io/x-tools-author/x-tools-ubuntu-20.04:android-armv7

View File

@ -49,7 +49,7 @@ jobs:
cp -r $ANDROID_HOME/cmdline-tools sdk/cmdline-tools
cp -r $ANDROID_HOME/extras sdk/extras
cp -r $ANDROID_HOME/licenses sdk/licenses
cp -r $ANDROID_HOME/ndk/27.2.12479018 sdk/ndk/27.2.12479018
echo "cp -r $ANDROID_HOME/ndk/27.2.12479018 sdk/ndk/27.2.12479018"
cp -r $ANDROID_HOME/platforms/android-35 sdk/platforms/android-35
cp -r $ANDROID_HOME/platform-tools sdk/platform-tools
cp -r $ANDROID_HOME/.knownPackages sdk/.knownPackages

View File

@ -61,7 +61,13 @@ COPY sdk/build-tools $ANDROID_HOME/build-tools
COPY sdk/cmdline-tools $ANDROID_HOME/cmdline-tools
COPY sdk/extras $ANDROID_HOME/extras
COPY sdk/licenses $ANDROID_HOME/licenses
COPY sdk/ndk/27.2.12479018 $ANDROID_HOME/ndk/27.2.12479018
# COPY sdk/ndk/27.2.12479018 $ANDROID_HOME/ndk/27.2.12479018
# Downloading NDK 27.2.12479018 then extracting it to $ANDROID_HOME/ndk/27.2.12479018
RUN wget https://dl.google.com/android/repository/android-ndk-r27c-linux.zip -O /tmp/android-ndk.zip
RUN unzip /tmp/android-ndk.zip -d $ANDROID_HOME/ndk
RUN mv $ANDROID_HOME/ndk/android-ndk-r27 $ANDROID_HOME/ndk/27.2.12479018
COPY sdk/platforms/android-35 $ANDROID_HOME/platforms/android-35
COPY sdk/platform-tools $ANDROID_HOME/platform-tools
COPY sdk/.knownPackages $ANDROID_HOME/.knownPackages