[Android] Bump the CI images and prevent some git security to be applied on libnvlcjni
Nicolas Pomepuy
git at videolan.org
Tue Mar 14 11:59:20 UTC 2023
vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Tue Mar 14 11:32:11 2023 +0100| [524ff84cc17abc0654a2db4e2ab42b942cd72e96] | committer: Nicolas Pomepuy
Bump the CI images and prevent some git security to be applied on libnvlcjni
> https://code.videolan.org/videolan/vlc-android/commit/524ff84cc17abc0654a2db4e2ab42b942cd72e96
---
buildsystem/gitlab/.gitlab-ci.yml | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml
index 8698a2348f..ac266ee6ef 100644
--- a/buildsystem/gitlab/.gitlab-ci.yml
+++ b/buildsystem/gitlab/.gitlab-ci.yml
@@ -120,28 +120,28 @@ build-ml-x86_64:
build-ml-arm64-v4:
extends: .build-ml-base
- image: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
variables:
ARCH: arm64
EXTRA_BUILD_PARAM: -vlc4
build-ml-armv7-v4:
extends: .build-ml-base
- image: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
variables:
ARCH: arm
EXTRA_BUILD_PARAM: -vlc4
build-ml-x86-v4:
extends: .build-ml-base
- image: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
variables:
ARCH: x86
EXTRA_BUILD_PARAM: -vlc4
build-ml-x86_64-v4:
extends: .build-ml-base
- image: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
variables:
ARCH: x86_64
EXTRA_BUILD_PARAM: -vlc4
@@ -194,7 +194,7 @@ 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: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
variables:
@@ -207,7 +207,7 @@ nightly-arm64-v4:
nightly-armv7-v4:
extends: .build-all-base
- image: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
variables:
@@ -220,7 +220,7 @@ nightly-armv7-v4:
nightly-x86-v4:
extends: .build-all-base
- image: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
variables:
@@ -233,7 +233,7 @@ nightly-x86-v4:
nightly-x86_64-v4:
extends: .build-all-base
- image: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
rules:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $VLC4 == "true"'
variables:
@@ -263,7 +263,7 @@ nightly-x86_64-v4:
M2_REPO: "$CI_PROJECT_DIR/aars/repository"
.build-libs-base-v4:
- image: registry.videolan.org/vlc-debian-android:20220811103057
+ image: registry.videolan.org/vlc-debian-android:20230212071537
rules:
- if: '$CI_COMMIT_TAG =~ /^libvlc-4.*$/'
stage: build
@@ -355,6 +355,7 @@ publish_libs-v4:
- job: "build-libs-x86_64-v4"
script:
- mkdir -p $M2_REPO
+ - git config --global --add safe.directory $CI_PROJECT_DIR/libvlcjni
- ./buildsystem/compile.sh --init -b -vlc4
- GRADLE_ABI=ALL RELEASE_SIGNING_ENABLED=false ./gradlew -Dmaven.repo.local=$M2_REPO -PforceVlc4=true -p libvlcjni publishToMavenLocal
- GRADLE_ABI=ALL RELEASE_SIGNING_ENABLED=false ./gradlew -Dmaven.repo.local=$M2_REPO -PforceVlc4=true -p medialibrary publishToMavenLocal
More information about the Android
mailing list