Merge branch 'dbkr/package_dont_fail_if_no_local_config' into dbkr/buildkite_cd

This commit is contained in:
David Baker 2019-04-26 14:28:45 +01:00
commit ff21bde839
1 changed files with 1 additions and 1 deletions

View File

@ -24,7 +24,7 @@ mkdir -p dist
cp -r webapp riot-$version cp -r webapp riot-$version
# Just in case you have a local config, remove it before packaging # Just in case you have a local config, remove it before packaging
rm riot-$version/config.json rm riot-$version/config.json || true
# if $version looks like semver with leading v, strip it before writing to file # if $version looks like semver with leading v, strip it before writing to file
if [[ ${version} =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then if [[ ${version} =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then