Skip to content

Commit a711fcb

Browse files
mikdusanandrewrk
authored andcommitted
ci: linux: supply on_master_sucess with VERSION
- move on_master_success to the package step - add required secret availability for packaging This replaces a1b79ea .
1 parent 7d1f473 commit a711fcb

File tree

3 files changed

+8
-41
lines changed

3 files changed

+8
-41
lines changed

ci/zinc/drone.yml

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -40,31 +40,7 @@ steps:
4040
from_secret: AWS_ACCESS_KEY_ID
4141
AWS_SECRET_ACCESS_KEY:
4242
from_secret: AWS_SECRET_ACCESS_KEY
43-
commands:
44-
- ./ci/zinc/linux_package.sh
45-
46-
---
47-
kind: pipeline
48-
type: docker
49-
name: on-master-success
50-
platform:
51-
os: linux
52-
arch: amd64
53-
workspace:
54-
path: /workspace
55-
depends_on:
56-
- x86_64-linux
57-
trigger:
58-
branch:
59-
- master
60-
event:
61-
- push
62-
63-
steps:
64-
- name: on-master-sucess
65-
image: ci/debian-amd64:11.1-2
66-
environment:
6743
SRHT_OAUTH_TOKEN:
6844
from_secret: SRHT_OAUTH_TOKEN
6945
commands:
70-
- ./ci/zinc/linux_on_master_sucess.sh
46+
- ./ci/zinc/linux_package.sh

ci/zinc/linux_on_master_sucess.sh

Lines changed: 0 additions & 14 deletions
This file was deleted.

ci/zinc/linux_package.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,13 @@ s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" "
3636
# Publish manifest.
3737
s3cmd 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_script
40-
echo "$VERSION" > $WORKSPACE/env.version
39+
# Avoid leaking oauth token.
40+
set +x
41+
42+
cd $WORKSPACE
43+
./ci/srht/on_master_success "$VERSION" "$SRHT_OAUTH_TOKEN"
44+
45+
set -x
4146

4247
# Explicit exit helps show last command duration.
4348
exit

0 commit comments

Comments
 (0)