Skip to content
Snippets Groups Projects
Commit cb381e69 authored by Steve Lhomme's avatar Steve Lhomme
Browse files

CI: use the v4 (unversioned) Docker image by default

The 3.0 should fall into legacy for maintenance at some point.
parent 129626b9
No related branches found
No related tags found
1 merge request!1760CI: use the v4 Docker image by default
Pipeline #361736 passed with stage
in 44 minutes and 39 seconds
......@@ -15,6 +15,8 @@ variables:
default:
interruptible: true
image:
name: $VLC_ANDROID_IMAGE_40
tags:
- amd64
- docker
......@@ -74,8 +76,6 @@ continuous-app-build:
continuous-app-build-v4:
extends: .build-all-base
image:
name: $VLC_ANDROID_IMAGE_40
script:
- ./buildsystem/compile.sh --init
- ./gradlew assembleDebug -PforceVlc4=true
......@@ -145,32 +145,24 @@ build-ml-x86_64:
build-ml-arm64-v4:
extends: .build-ml-base
image:
name: $VLC_ANDROID_IMAGE_40
variables:
ARCH: arm64
EXTRA_BUILD_PARAM: -vlc4
build-ml-armv7-v4:
extends: .build-ml-base
image:
name: $VLC_ANDROID_IMAGE_40
variables:
ARCH: arm
EXTRA_BUILD_PARAM: -vlc4
build-ml-x86-v4:
extends: .build-ml-base
image:
name: $VLC_ANDROID_IMAGE_40
variables:
ARCH: x86
EXTRA_BUILD_PARAM: -vlc4
build-ml-x86_64-v4:
extends: .build-ml-base
image:
name: $VLC_ANDROID_IMAGE_40
variables:
ARCH: x86_64
EXTRA_BUILD_PARAM: -vlc4
......@@ -231,8 +223,6 @@ nightly-x86_64:
# Weekly builds: build native & app code, and ship the APK as artifact for vlc4
nightly-arm64-v4:
extends: .build-all-base
image:
name: $VLC_ANDROID_IMAGE_40
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
variables:
......@@ -245,8 +235,6 @@ nightly-arm64-v4:
nightly-armv7-v4:
extends: .build-all-base
image:
name: $VLC_ANDROID_IMAGE_40
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
variables:
......@@ -259,8 +247,6 @@ nightly-armv7-v4:
nightly-x86-v4:
extends: .build-all-base
image:
name: $VLC_ANDROID_IMAGE_40
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
variables:
......@@ -273,8 +259,6 @@ nightly-x86-v4:
nightly-x86_64-v4:
extends: .build-all-base
image:
name: $VLC_ANDROID_IMAGE_40
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
variables:
......@@ -306,8 +290,6 @@ nightly-x86_64-v4:
M2_REPO: "$CI_PROJECT_DIR/aars/repository"
.build-libs-base-v4:
image:
name: $VLC_ANDROID_IMAGE_40
rules:
- if: '$CI_COMMIT_TAG =~ /^libvlc-4.*$/'
stage: build
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment