<html><head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class="">Hi,<div class=""><br class=""></div><div class="">I successfully tried to execute the non-nightly build jobs here: <a href="https://code.videolan.org/dfuhrmann/vlc-3.0/-/pipelines/59973" class="">https://code.videolan.org/dfuhrmann/vlc-3.0/-/pipelines/59973</a></div><div class=""><br class=""></div><div class="">BR. David<br class=""><div><br class=""><blockquote type="cite" class=""><div class="">Am 21.01.2021 um 22:24 schrieb <a href="mailto:david.fuhrmann@gmail.com" class="">david.fuhrmann@gmail.com</a>:</div><br class="Apple-interchange-newline"><div class=""><div class="">From: David Fuhrmann <<a href="mailto:dfuhrmann@videolan.org" class="">dfuhrmann@videolan.org</a>><br class=""><br class="">Restructure scripts into common builders for mac and mac nightly.<br class="">Add dedicated jobs to build for macos-arm64, and rename the<br class="">old macos jobs to macos-x86_64.<br class=""><br class="">The arm builds are running on the catalina machine, the old builds<br class="">stay on old-macmini.<br class="">---<br class=""> extras/ci/gitlab-ci.yml | 48 +++++++++++++++++++++++++++++++++--------<br class=""> 1 file changed, 39 insertions(+), 9 deletions(-)<br class=""><br class="">diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml<br class="">index 1eced83cdc..bde77b08b1 100644<br class="">--- a/extras/ci/gitlab-ci.yml<br class="">+++ b/extras/ci/gitlab-ci.yml<br class="">@@ -37,11 +37,20 @@ variables:<br class=""> HOST_ARCH: x86_64<br class=""> TRIPLET: $HOST_ARCH-w64-mingw32<br class=""><br class="">-.variables-macos: &variables-macos<br class="">+.variables-macos-x86_64: &variables-macos-x86_64<br class=""> VLC_PATH: /Users/videolanci/sandbox/bin<br class=""> VLC_FORCE_KERNELVERSION: 18<br class=""> VLC_SDK_PATH: /Applications/Xcode9.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk<br class=""> HOST_ARCH: x86_64<br class="">+ VLC_ARCH_NAME: intel64<br class="">+ TRIPLET: $HOST_ARCH-apple-darwin$VLC_FORCE_KERNELVERSION<br class="">+<br class="">+.variables-macos-arm64: &variables-macos-arm64<br class="">+ VLC_PATH: /Users/videolanci/sandbox/bin<br class="">+ VLC_FORCE_KERNELVERSION: 19<br class="">+ VLC_SDK_PATH: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk<br class="">+ HOST_ARCH: aarch64<br class="">+ VLC_ARCH_NAME: arm64<br class=""> TRIPLET: $HOST_ARCH-apple-darwin$VLC_FORCE_KERNELVERSION<br class=""><br class=""> .variables-android-arm: &variables-android-arm<br class="">@@ -229,10 +238,8 @@ nightly-snap:<br class=""> #<br class=""> # macOS<br class=""> #<br class="">-macos:<br class="">+.macos-common:<br class=""> extends: .base-template<br class="">- tags:<br class="">- - old-macmini<br class=""> script: |<br class=""> if [ "${CI_JOB_NAME:0:8}" = "nightly-" ]; then<br class=""> NIGHTLY_EXTRA_BUILD_FLAGS="-i n"<br class="">@@ -246,22 +253,45 @@ macos:<br class=""> EXTRA_BUILD_FLAGS="-c -p"<br class=""> fi<br class=""> mkdir build && cd build<br class="">- ../extras/package/macosx/build.sh $EXTRA_BUILD_FLAGS -k $VLC_SDK_PATH $NIGHTLY_EXTRA_BUILD_FLAGS<br class="">- variables: *variables-macos<br class="">+ ../extras/package/macosx/build.sh $EXTRA_BUILD_FLAGS -a $HOST_ARCH -k $VLC_SDK_PATH $NIGHTLY_EXTRA_BUILD_FLAGS<br class="">+<br class="">+macos-x86_64:<br class="">+ extends: .macos-common<br class="">+ tags:<br class="">+ - old-macmini<br class="">+ variables: *variables-macos-x86_64<br class=""><br class="">-nightly-macos:<br class="">- extends: macos<br class="">+macos-arm64:<br class="">+ extends: .macos-common<br class="">+ tags:<br class="">+ - catalina<br class="">+ variables: *variables-macos-arm64<br class="">+<br class="">+.nightly-macos-common:<br class="">+ extends: .macos-common<br class=""> only:<br class=""> - schedules<br class=""> except:<br class=""> after_script:<br class=""> - mkdir nightlies<br class="">- - mv build/vlc-*.dmg nightlies/$(basename build/vlc-*.dmg | sed "s/\.dmg/-${CI_COMMIT_SHORT_SHA}\.dmg/")<br class="">+ - mv build/vlc-*.dmg nightlies/$(basename build/vlc-*.dmg | sed "s/\.dmg/-${VLC_ARCH_NAME}-${CI_COMMIT_SHORT_SHA}\.dmg/")<br class=""> - cd nightlies && find . -maxdepth 1 -type f -not -name SHA512SUM | xargs shasum -a 512 | tee SHA512SUM<br class=""> artifacts:<br class=""> paths:<br class=""> - nightlies/*<br class=""><br class="">+nightly-macos-x86_64:<br class="">+ extends: .nightly-macos-common<br class="">+ tags:<br class="">+ - old-macmini<br class="">+ variables: *variables-macos-x86_64<br class="">+<br class="">+nightly-macos-arm64:<br class="">+ extends: .nightly-macos-common<br class="">+ tags:<br class="">+ - catalina<br class="">+ variables: *variables-macos-arm64<br class="">+<br class=""> #<br class=""> # Android<br class=""> #<br class="">-- <br class="">2.21.1 (Apple Git-122.3)<br class=""><br class=""></div></div></blockquote></div><br class=""></div></body></html>