diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-11-03 14:20:35 -0500 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-11-03 14:20:35 -0500 |
| commit | 629b91da610e2567c5ce4df097e062c0b605ebc0 (patch) | |
| tree | b285ec144eae97d2a7dc592b614b5667e09b5b1c | |
| parent | 5001faa690ce12374260334beb5f26dfa3f61613 (diff) | |
| download | zig-629b91da610e2567c5ce4df097e062c0b605ebc0.tar.gz zig-629b91da610e2567c5ce4df097e062c0b605ebc0.zip | |
ci: use heredoc and alpine/edge for faster sr.ht job
| -rwxr-xr-x | ci/srht/on_master_success | 25 | ||||
| -rwxr-xr-x | ci/srht/update_download_page | 1 |
2 files changed, 15 insertions, 11 deletions
diff --git a/ci/srht/on_master_success b/ci/srht/on_master_success index 0de9169109..7638ec70d8 100755 --- a/ci/srht/on_master_success +++ b/ci/srht/on_master_success @@ -4,6 +4,7 @@ # It assumes that the following things are installed: # * curl # * jq +# * cat set -x set -e @@ -12,17 +13,19 @@ VERSION="$1" OAUTH_TOKEN="$2" YML_FILE="tmp.yml" -echo "image: ubuntu/xenial" >> "$YML_FILE" -echo "packages:" >> "$YML_FILE" -echo " - s3cmd" >> "$YML_FILE" -echo " - curl" >> "$YML_FILE" -echo " - jq" >> "$YML_FILE" -echo "secrets:" >> "$YML_FILE" -echo " - 6c60aaee-92e7-4e7d-812c-114817689b4d" >> "$YML_FILE" -echo "sources:" >> "$YML_FILE" -echo " - https://github.com/ziglang/zig" >> "$YML_FILE" -echo "tasks:" >> "$YML_FILE" -echo " - build: cd zig && ./ci/srht/update_download_page $VERSION" >> "$YML_FILE" +cat <<EOF >"$YML_FILE" +image: alpine/edge +packages: + - py3-pip + - curl + - jq +secrets: + - 6c60aaee-92e7-4e7d-812c-114817689b4d +sources: + - https://github.com/ziglang/zig +tasks: + - build: cd zig && ./ci/srht/update_download_page $VERSION +EOF jq <$YML_FILE -sR '{ "manifest": ., diff --git a/ci/srht/update_download_page b/ci/srht/update_download_page index 7e42d3a3bc..d27fb49bd0 100755 --- a/ci/srht/update_download_page +++ b/ci/srht/update_download_page @@ -23,6 +23,7 @@ curl --fail -I "$X86_64_WINDOWS_JSON_URL" || exit 0 curl --fail -I "$X86_64_MACOS_JSON_URL" || exit 0 curl --fail -I "$X86_64_FREEBSD_JSON_URL" || exit 0 +pip3 install s3cmd rm -rf .git cd "$HOME" |