Commit 0ca1dff5 authored by Konstantin Pavlov's avatar Konstantin Pavlov

CI: Sanitize variable names

parent 7e974218
Pipeline #7050 passed with stage
in 76 minutes and 7 seconds
......@@ -2,29 +2,29 @@ stages:
- build
.variables-debian-amd64: &variables-debian-amd64
_NAME: debian-amd64
NAME: debian-amd64
.variables-win32: &variables-win32
_MACHINE: i686
_TRIPLET: ${_MACHINE}-w64-mingw32
_NAME: win32
MACHINE: i686
TRIPLET: $MACHINE-w64-mingw32
NAME: win32
.variables-win64: &variables-win64
_MACHINE: x86_64
_TRIPLET: ${_MACHINE}-w64-mingw32
_NAME: win64
MACHINE: x86_64
TRIPLET: $MACHINE-w64-mingw32
NAME: win64
.variables-win64-llvm: &variables-win64-llvm
_MACHINE: x86_64
_TRIPLET: ${_MACHINE}-w64-mingw32
_NAME: win64
MACHINE: x86_64
TRIPLET: $MACHINE-w64-mingw32
NAME: win64
WINE_SDK_PATH: /usr/include/wine/wine/windows/
.variables-macos: &variables-macos
VLC_PATH: /Users/videolanci/sandbox/bin
VLC_FORCE_KERNELVERSION: 17
_NAME: macosx-intel
_TRIPLET: x86_64-apple-darwin${VLC_FORCE_KERNELVERSION}
NAME: macosx-intel
TRIPLET: x86_64-apple-darwin$VLC_FORCE_KERNELVERSION
.docker-common:
stage: build
......@@ -35,7 +35,7 @@ stages:
.nightly-common: &nightly-common
before_script:
- export _VLC_VERSION=`fgrep AC_INIT configure.ac | cut -d\[ -f 3 | cut -d- -f 1`
- export VLC_VERSION=`fgrep AC_INIT configure.ac | cut -d\[ -f 3 | cut -d- -f 1`
only:
refs:
- schedules
......@@ -49,10 +49,10 @@ stages:
- schedules
script: |
set -x
mkdir -p contrib/contrib-${_NAME} && cd contrib/contrib-${_NAME}
curl -f -L https://nightlies.videolan.org/build/${_NAME}/last/vlc-contrib-${_TRIPLET}-`date +%Y%m%d`.tar.bz2 -o vlc-contrib-${_TRIPLET}-latest.tar.bz2 || curl -f -L https://nightlies.videolan.org/build/${_NAME}/last/vlc-contrib-${_TRIPLET}-`date --date=yesterday +%Y%m%d`.tar.bz2 -o vlc-contrib-${_TRIPLET}-latest.tar.bz2
mkdir -p contrib/contrib-$NAME && cd contrib/contrib-$NAME
curl -f -L https://nightlies.videolan.org/build/$NAME/last/vlc-contrib-$TRIPLET-`date +%Y%m%d`.tar.bz2 -o vlc-contrib-$TRIPLET-latest.tar.bz2 || curl -f -L https://nightlies.videolan.org/build/$NAME/last/vlc-contrib-$TRIPLET-`date --date=yesterday +%Y%m%d`.tar.bz2 -o vlc-contrib-$TRIPLET-latest.tar.bz2
cd ../../
extras/package/win32/build.sh -p -a ${_MACHINE}
extras/package/win32/build.sh -p -a $MACHINE
.win32-continuous: &win32-continuous
extends: .win-continuous
......@@ -71,18 +71,18 @@ stages:
extends: .docker-common
script: |
set -x
extras/package/win32/build.sh -l -c -a ${_MACHINE} -i n
cd ${_NAME}
extras/package/win32/build.sh -l -c -a $MACHINE -i n
cd $NAME
ls -la
find . -maxdepth 1 -type f -name "vlc-*-dev*${_NAME}*" | xargs sha512sum | tee SHA512SUM
mv vlc-*-dev-${_NAME}.exe $(ls vlc-*-dev-${_NAME}.exe | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-${_NAME}.msi $(ls vlc-*-dev-${_NAME}.msi | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-${_NAME}.7z $(ls vlc-*-dev-${_NAME}.7z | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-${_NAME}.zip $(ls vlc-*-dev-${_NAME}.zip | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-${_NAME}.xpi $(ls vlc-*-dev-${_NAME}.xpi | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-${_NAME}-debug.7z $(ls vlc-*-dev-${_NAME}-debug.7z | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-${_NAME}-debug.zip $(ls vlc-*-dev-${_NAME}-debug.zip | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
echo lftp -c "set ftp:use-allo false;open nightlies.videolan.org:65021;cd UploadQueue;mkdir -p ${_NAME}/vlc-${_VLC_VERSION}-`date +%Y%m%d-%H%M`/; cd ${_NAME}/vlc-${_VLC_VERSION}-`date +%Y%m%d-%H%M`; mput vlc-*.zip vlc-*.exe vlc-*.msi vlc-*.7z vlc-*.xpi ../contrib/vlc-contrib-*.tar.bz2 SHA512SUM"
find . -maxdepth 1 -type f -name "vlc-*-dev*$NAME*" | xargs sha512sum | tee SHA512SUM
mv vlc-*-dev-$NAME.exe $(ls vlc-*-dev-$NAME.exe | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-$NAME.msi $(ls vlc-*-dev-$NAME.msi | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-$NAME.7z $(ls vlc-*-dev-$NAME.7z | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-$NAME.zip $(ls vlc-*-dev-$NAME.zip | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-$NAME.xpi $(ls vlc-*-dev-$NAME.xpi | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-$NAME-debug.7z $(ls vlc-*-dev-$NAME-debug.7z | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
mv vlc-*-dev-$NAME-debug.zip $(ls vlc-*-dev-$NAME-debug.zip | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
echo lftp -c "set ftp:use-allo false;open nightlies.videolan.org:65021;cd UploadQueue;mkdir -p $NAME/vlc-$VLC_VERSION-`date +%Y%m%d-%H%M`/; cd $NAME/vlc-$VLC_VERSION-`date +%Y%m%d-%H%M`; mput vlc-*.zip vlc-*.exe vlc-*.msi vlc-*.7z vlc-*.xpi ../contrib/vlc-contrib-*.tar.bz2 SHA512SUM"
.win32-nightly:
......@@ -117,7 +117,7 @@ win64-llvm-nightly:
name: registry.videolan.org/vlc-debian-unstable:20190416182140
variables: *variables-debian-amd64
before_script:
- export _NCPU=$(getconf _NPROCESSORS_ONLN)
- export NCPU=$(getconf _NPROCESSORS_ONLN)
debian-amd64:
extends: .debian-common
......@@ -127,7 +127,7 @@ debian-amd64:
set -x
./bootstrap
./configure
make -j${_NCPU} -k || make -j1
make -j$NCPU -k || make -j1
make check || cat ./test-suite.log
debian-amd64-nightly:
......@@ -135,19 +135,19 @@ debian-amd64-nightly:
extends: .debian-common
script: |
set -x
cd extras/tools && ./bootstrap && make -j${_NCPU} -k || make -j1
cd extras/tools && ./bootstrap && make -j$NCPU -k || make -j1
export PATH=`pwd`/build/bin:$PATH
cd ../../
cd contrib && mkdir native && cd native
../bootstrap --disable-srt --enable-matroska
make list
make -j${_NCPU} fetch
make -j${_NCPU} -k || make -j1
make -j$NCPU fetch
make -j$NCPU -k || make -j1
cd ../../
./bootstrap
mkdir build && cd build
../configure
make -j${_NCPU} -k || make -j1
make -j$NCPU -k || make -j1
make check || cat ./test-suite.log
debian-amd64-nightly-source:
......@@ -158,8 +158,8 @@ debian-amd64-nightly-source:
./bootstrap
mkdir build && cd build
../configure
make -j${_NCPU}
VLC_TEST_TIMEOUT=60 make -j${_NCPU} distcheck VERBOSE=1
make -j$NCPU
VLC_TEST_TIMEOUT=60 make -j$NCPU distcheck VERBOSE=1
mv vlc-*.tar.xz $(ls vlc-*.tar.xz | sed -re "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
echo lftp -c "set ftp:use-allo false;open nightlies.videolan.org:65021;cd UploadQueue;mkdir -p source ;cd source;mput vlc-*.tar.xz"
......@@ -192,8 +192,8 @@ macos:
- schedules
script: |
set -x
mkdir -p contrib/contrib-${_TRIPLET} && cd contrib/contrib-${_TRIPLET}
curl -f -L https://nightlies.videolan.org/build/${_NAME}/last/vlc-contrib-${_TRIPLET}-`date +%Y%m%d`.tar.bz2 -o vlc-contrib-${_TRIPLET}-latest.tar.bz2 || curl -f -L https://nightlies.videolan.org/build/${_NAME}/last/vlc-contrib-${_TRIPLET}-`date --date=yesterday +%Y%m%d`.tar.bz2 -o vlc-contrib-${_TRIPLET}-latest.tar.bz2
mkdir -p contrib/contrib-$TRIPLET && cd contrib/contrib-$TRIPLET
curl -f -L https://nightlies.videolan.org/build/$NAME/last/vlc-contrib-$TRIPLET-`date +%Y%m%d`.tar.bz2 -o vlc-contrib-$TRIPLET-latest.tar.bz2 || curl -f -L https://nightlies.videolan.org/build/$NAME/last/vlc-contrib-$TRIPLET-`date --date=yesterday +%Y%m%d`.tar.bz2 -o vlc-contrib-$TRIPLET-latest.tar.bz2
cd ../../
mkdir build
cd build
......@@ -210,6 +210,6 @@ macos-nightly:
../extras/package/macosx/build.sh -c -p
make check || /usr/bin/true
ls -la
find . -maxdepth 1 -type f -name "vlc-*-dev*${_NAME}*" | xargs sha512sum | tee SHA512SUM
find . -maxdepth 1 -type f -name "vlc-*-dev*$NAME*" | xargs sha512sum | tee SHA512SUM
mv vlc-*.dmg $(ls vlc-*.dmg | sed -E "s/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)/\1-`date +%Y%m%d-%H%M`/")
echo /usr/local/bin/lftp -c "set ftp:use-allo false;open nightlies.videolan.org:65021;cd UploadQueue;mkdir -p macosx-intel/vlc-${_VLC_VERSION}-`date +%Y%m%d-%H%M`/; cd macosx-intel/vlc-${_VLC_VERSION}-`date +%Y%m%d-%H%M`; mput vlc-*.dmg; mput ../contrib/vlc-contrib-*.tar.bz2"
echo /usr/local/bin/lftp -c "set ftp:use-allo false;open nightlies.videolan.org:65021;cd UploadQueue;mkdir -p macosx-intel/vlc-$VLC_VERSION-`date +%Y%m%d-%H%M`/; cd macosx-intel/vlc-$VLC_VERSION-`date +%Y%m%d-%H%M`; mput vlc-*.dmg; mput ../contrib/vlc-contrib-*.tar.bz2"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment