| author |  Michael Dusan <michael.dusan@gmail.com> 2021-12-06 21:02:47-05:00 |
| committer |  Andrew Kelley <andrew@ziglang.org> 2021-12-06 23:13:06-08:00 |
| log | a711fcbbfa41d3f1dedc7ce4be9106e21b6c7ffb |
| tree | 601e6d1e034ca81e1b23f7b8c77283feaf726c59 |
| parent | 7d1f47313d798ce42f519b770edb2f1dae17199e |
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 | 40 | from_secret: AWS_ACCESS_KEY_ID |
| 41 | 41 | AWS_SECRET_ACCESS_KEY: |
| 42 | 42 | 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: | |
| 67 | 43 | SRHT_OAUTH_TOKEN: |
| 68 | 44 | from_secret: SRHT_OAUTH_TOKEN |
| 69 | 45 | commands: |
| 70 | - ./ci/zinc/linux_on_master_sucess.sh | |
| 46 | - ./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 | ||
| 5 | VERSION=$(cat $WORKSPACE/env.version) | |
| 6 | ||
| 7 | # Avoid leaking oauth token. | |
| 8 | set +x | |
| 9 | ||
| 10 | cd $WORKSPACE | |
| 11 | ./ci/srht/on_master_success "$VERSION" "$SRHT_OAUTH_TOKEN" | |
| 12 | ||
| 13 | # Explicit exit helps show last command duration. | |
| 14 | exit |
ci/zinc/linux_package.sh+7-2
| ... | ... | @@ -36,8 +36,13 @@ s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" " |
| 36 | 36 | # Publish manifest. |
| 37 | 37 | s3cmd put -P --add-header="cache-control: max-age=0, must-revalidate" "$MANIFEST" "s3://ziglang.org/builds/$ARCH-linux-$VERSION.json" |
| 38 | 38 | |
| 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 | |
| 41 | 46 | |
| 42 | 47 | # Explicit exit helps show last command duration. |
| 43 | 48 | exit |