diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2024-02-15 09:16:00 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2024-02-19 14:05:54 +0000 |
| commit | 9864bf313b33388daa410c6dbdf858859c129979 (patch) | |
| tree | e04d9250efb39faba0cdf995b130074dc74fe379 | |
| parent | 569f804a75c045785a626f2cc8806af9e5ae5978 (diff) | |
docker: reduce number of Android images
Only Qt LTS images remain.
Change-Id: Ic3fa3b661601a684f75b7e8ce6d74fa3bf0edab4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | .github/workflows/main.yml | 14 | ||||
| -rw-r--r-- | docker-compose.yml | 22 |
2 files changed, 0 insertions, 36 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 61e47cb6f..c5fc827d1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -393,20 +393,6 @@ jobs: script: './scripts/test-qt-for-android.sh', } - { - name: 'Run Android tests (Qt 6.3.0)', - image: 'focal-android-630', - suffix: 'linux', - profile: '', - script: './scripts/test-qt-for-android.sh', - } - - { - name: 'Run Android tests (Qt 6.4.2)', - image: 'focal-android-642', - suffix: 'linux', - profile: '', - script: './scripts/test-qt-for-android.sh', - } - - { name: 'Run Android tests (Qt 6.5.0)', image: 'focal-android-650', suffix: 'linux', diff --git a/docker-compose.yml b/docker-compose.yml index 41946ba08..835cfda9f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -87,28 +87,6 @@ services: QT_VERSION: 6.2.0 ANDROID_NDK_VERSION: 23.0.7599858 - focal-android-630: - << : *linux - hostname: focal-android - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-6.3.0-0 - build: - dockerfile: docker/focal/test-android.Dockerfile - context: . - args: - QT_VERSION: 6.3.0 - ANDROID_NDK_VERSION: 23.0.7599858 - - focal-android-642: - << : *linux - hostname: focal-android - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-6.4.2-0 - build: - dockerfile: docker/focal/test-android.Dockerfile - context: . - args: - QT_VERSION: 6.4.2 - ANDROID_NDK_VERSION: 23.0.7599858 - focal-android-650: << : *linux hostname: focal-android |