diff options
| author | jaseg <git@jaseg.de> | 2020-11-18 13:36:59 +0100 |
|---|---|---|
| committer | jaseg <git@jaseg.de> | 2020-11-18 13:36:59 +0100 |
| commit | a817299570cef674173b87eeba77e15f26d7cd0d (patch) | |
| tree | 53b17ce80ebd5b9303aa920ac581ed6043c2117b | |
| parent | 51987e1e3b00f89af3c0e72ea8ad760284dc8b84 (diff) | |
| download | stm32square-a817299570cef674173b87eeba77e15f26d7cd0d.tar.gz stm32square-a817299570cef674173b87eeba77e15f26d7cd0d.tar.bz2 stm32square-a817299570cef674173b87eeba77e15f26d7cd0d.zip | |
Fix missing dependencies and variable exports
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | tools/do_release.sh | 9 | ||||
| -rw-r--r-- | tools/get_p2_url.py | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 63440ff..e2960aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ on-schedule: only: - schedules script: + - pip3 install requests beautifulsoup4 - sh tools/do_release.sh release: diff --git a/tools/do_release.sh b/tools/do_release.sh index f510709..8171334 100644 --- a/tools/do_release.sh +++ b/tools/do_release.sh @@ -1,14 +1,15 @@ #!/bin/sh +set -e SOURCE_BRANCH=$(git branch --show-current) RELEASE_TRIGGER=${RELEASE_TRIGGER:-"Manual command-line makefile invocation"} -GIT_AUTHOR_NAME=${GIT_AUTHOR_NAME:-'STM32Square Auto-Release Script'} -GIT_AUTHOR_EMAIL=${GIT_AUTHOR_EMAIL:-'autorelease@stm32square.jaseg.de'} +set -x GIT_AUTHOR_NAME=${GIT_AUTHOR_NAME:-'STM32Square Auto-Release Script'} +set -x GIT_AUTHOR_EMAIL=${GIT_AUTHOR_EMAIL:-'autorelease@stm32square.jaseg.de'} if [ ! -z ${GITLAB_USER_EMAIL+x} ]; then - GIT_COMMITTER_NAME="$GITLAB_USER_NAME" - GIT_COMMITTER_EMAIL="$GITLAB_USER_EMAIL" + set -x GIT_COMMITTER_NAME="$GITLAB_USER_NAME" + set -x GIT_COMMITTER_EMAIL="$GITLAB_USER_EMAIL" fi TIMESTAMP=${TIMESTAMP:-$(date +%y-%m-%d)} diff --git a/tools/get_p2_url.py b/tools/get_p2_url.py index f2162cd..2befda6 100644 --- a/tools/get_p2_url.py +++ b/tools/get_p2_url.py @@ -1,18 +1,18 @@ #!/usr/bin/env python3 -import requests import re -from bs4 import BeautifulSoup import sys import lzma from urllib.parse import urlparse from contextlib import suppress import os from os import path -from tqdm import tqdm import shutil import time from pathlib import Path +import requests +from bs4 import BeautifulSoup + def fucked_up_get(*args, **kwargs): for retry in range(5): for timeout in [0.1, 0.5, 1.0, 2.0, 5.0]: |