authorgravatar for michael.dusan@gmail.comMichael Dusan <michael.dusan@gmail.com> 2021-12-06 21:02:47-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-12-06 23:13:06-08:00
loga711fcbbfa41d3f1dedc7ce4be9106e21b6c7ffb
tree601e6d1e034ca81e1b23f7b8c77283feaf726c59
parent7d1f47313d798ce42f519b770edb2f1dae17199e

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 .

3 files changed, 8 insertions(+), 41 deletions(-)

ci/zinc/drone.yml+1-25
...@@ -40,31 +40,7 @@ steps:...@@ -40,31 +40,7 @@ steps:
40 from_secret: AWS_ACCESS_KEY_ID40 from_secret: AWS_ACCESS_KEY_ID
41 AWS_SECRET_ACCESS_KEY:41 AWS_SECRET_ACCESS_KEY:
42 from_secret: AWS_SECRET_ACCESS_KEY42 from_secret: AWS_SECRET_ACCESS_KEY
43 commands:
44 - ./ci/zinc/linux_package.sh
45
46---
47kind: pipeline
48type: docker
49name: on-master-success
50platform:
51 os: linux
52 arch: amd64
53workspace:
54 path: /workspace
55depends_on:
56- x86_64-linux
57trigger:
58 branch:
59 - master
60 event:
61 - push
62
63steps:
64- name: on-master-sucess
65 image: ci/debian-amd64:11.1-2
66 environment:
67 SRHT_OAUTH_TOKEN:43 SRHT_OAUTH_TOKEN:
68 from_secret: SRHT_OAUTH_TOKEN44 from_secret: SRHT_OAUTH_TOKEN
69 commands:45 commands:
70 - ./ci/zinc/linux_on_master_sucess.sh46 - ./ci/zinc/linux_package.sh
ci/zinc/linux_on_master_sucess.sh deleted-14
...@@ -1,14 +0,0 @@
1#!/bin/sh
2
3. ./ci/zinc/linux_base.sh
4
5VERSION=$(cat $WORKSPACE/env.version)
6
7# Avoid leaking oauth token.
8set +x
9
10cd $WORKSPACE
11./ci/srht/on_master_success "$VERSION" "$SRHT_OAUTH_TOKEN"
12
13# Explicit exit helps show last command duration.
14exit
ci/zinc/linux_package.sh+7-2
...@@ -36,8 +36,13 @@ s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" "...@@ -36,8 +36,13 @@ s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" "
36# Publish manifest.36# Publish manifest.
37s3cmd put -P --add-header="cache-control: max-age=0, must-revalidate" "$MANIFEST" "s3://ziglang.org/builds/$ARCH-linux-$VERSION.json"37s3cmd put -P --add-header="cache-control: max-age=0, must-revalidate" "$MANIFEST" "s3://ziglang.org/builds/$ARCH-linux-$VERSION.json"
3838
39# Forward value to on_master_script39# Avoid leaking oauth token.
40echo "$VERSION" > $WORKSPACE/env.version40set +x
41
42cd $WORKSPACE
43./ci/srht/on_master_success "$VERSION" "$SRHT_OAUTH_TOKEN"
44
45set -x
4146
42# Explicit exit helps show last command duration.47# Explicit exit helps show last command duration.
43exit48exit