CI: better implementation for workaround introduced in f75cb1d4f2

Use predefined upload delays for each pipe.
This commit is contained in:
Leonid Pliushch 2019-07-22 22:38:32 +03:00
parent 7add4e28ef
commit c18beff6c0
2 changed files with 9 additions and 5 deletions

View File

@ -33,24 +33,28 @@ pipe:
name: Build and Upload - aarch64 name: Build and Upload - aarch64
environment: environment:
TERMUX_ARCH: aarch64 TERMUX_ARCH: aarch64
UPLOAD_DELAY: 0
pipe: pipe:
<< : *BUILD_PIPE_TEMPLATE << : *BUILD_PIPE_TEMPLATE
name: Build and Upload - arm name: Build and Upload - arm
environment: environment:
TERMUX_ARCH: arm TERMUX_ARCH: arm
UPLOAD_DELAY: 20
pipe: pipe:
<< : *BUILD_PIPE_TEMPLATE << : *BUILD_PIPE_TEMPLATE
name: Build and Upload - i686 name: Build and Upload - i686
environment: environment:
TERMUX_ARCH: i686 TERMUX_ARCH: i686
UPLOAD_DELAY: 40
pipe: pipe:
<< : *BUILD_PIPE_TEMPLATE << : *BUILD_PIPE_TEMPLATE
name: Build and Upload - x86_64 name: Build and Upload - x86_64
environment: environment:
TERMUX_ARCH: x86_64 TERMUX_ARCH: x86_64
UPLOAD_DELAY: 60
task: task:

View File

@ -129,11 +129,11 @@ else
fi fi
# Workaround for concurrent uploads. # Workaround for concurrent uploads.
UPLOAD_DELAY=$((30 + RANDOM % 120)) if [ "$UPLOAD_DELAY" != "0" ];
echo "[!] Using workaround for Bintray issue with concurrent uploads." echo "[!] Using workaround for Bintray issue with concurrent uploads."
echo "[!] Delaying upload by ${UPLOAD_DELAY} seconds." echo "[!] Delaying upload by ${UPLOAD_DELAY} seconds."
sleep $UPLOAD_DELAY sleep $UPLOAD_DELAY
unset UPLOAD_DELAY fi
for attempt in 1 2 3; do for attempt in 1 2 3; do
echo "[*] Uploading packages to Bintray:" echo "[*] Uploading packages to Bintray:"