diff options
| author | Michael Dusan <michael.dusan@gmail.com> | 2021-12-06 21:02:47 -0500 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2021-12-06 23:13:06 -0800 |
| commit | a711fcbbfa41d3f1dedc7ce4be9106e21b6c7ffb (patch) | |
| tree | 601e6d1e034ca81e1b23f7b8c77283feaf726c59 /ci | |
| parent | 7d1f47313d798ce42f519b770edb2f1dae17199e (diff) | |
| download | zig-a711fcbbfa41d3f1dedc7ce4be9106e21b6c7ffb.tar.gz zig-a711fcbbfa41d3f1dedc7ce4be9106e21b6c7ffb.zip | |
ci: linux: supply on_master_sucess with VERSION
- move on_master_success to the package step
- add required secret availability for packaging
This replaces a1b79ea5857a52332d9da49d261a7fd04e52a466 .
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/zinc/drone.yml | 26 | ||||
| -rwxr-xr-x | ci/zinc/linux_on_master_sucess.sh | 14 | ||||
| -rwxr-xr-x | ci/zinc/linux_package.sh | 9 |
3 files changed, 8 insertions, 41 deletions
diff --git a/ci/zinc/drone.yml b/ci/zinc/drone.yml index 2dc48bd5ed..e845cd350e 100644 --- a/ci/zinc/drone.yml +++ b/ci/zinc/drone.yml @@ -40,31 +40,7 @@ steps: from_secret: AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY: from_secret: AWS_SECRET_ACCESS_KEY - commands: - - ./ci/zinc/linux_package.sh - ---- -kind: pipeline -type: docker -name: on-master-success -platform: - os: linux - arch: amd64 -workspace: - path: /workspace -depends_on: -- x86_64-linux -trigger: - branch: - - master - event: - - push - -steps: -- name: on-master-sucess - image: ci/debian-amd64:11.1-2 - environment: SRHT_OAUTH_TOKEN: from_secret: SRHT_OAUTH_TOKEN commands: - - ./ci/zinc/linux_on_master_sucess.sh + - ./ci/zinc/linux_package.sh diff --git a/ci/zinc/linux_on_master_sucess.sh b/ci/zinc/linux_on_master_sucess.sh deleted file mode 100755 index 588a45bcfd..0000000000 --- a/ci/zinc/linux_on_master_sucess.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -. ./ci/zinc/linux_base.sh - -VERSION=$(cat $WORKSPACE/env.version) - -# Avoid leaking oauth token. -set +x - -cd $WORKSPACE -./ci/srht/on_master_success "$VERSION" "$SRHT_OAUTH_TOKEN" - -# Explicit exit helps show last command duration. -exit diff --git a/ci/zinc/linux_package.sh b/ci/zinc/linux_package.sh index 1add8ee172..547a2d76b8 100755 --- a/ci/zinc/linux_package.sh +++ b/ci/zinc/linux_package.sh @@ -36,8 +36,13 @@ s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" " # Publish manifest. s3cmd put -P --add-header="cache-control: max-age=0, must-revalidate" "$MANIFEST" "s3://ziglang.org/builds/$ARCH-linux-$VERSION.json" -# Forward value to on_master_script -echo "$VERSION" > $WORKSPACE/env.version +# Avoid leaking oauth token. +set +x + +cd $WORKSPACE +./ci/srht/on_master_success "$VERSION" "$SRHT_OAUTH_TOKEN" + +set -x # Explicit exit helps show last command duration. exit |