Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ variables:
CARGO_HOME: "${CI_PROJECT_DIR}/.cargo"
CARGO_TARGET: x86_64-unknown-linux-gnu

.no_git: &no_git
variables:
GIT_STRATEGY: none
GIT_SUBMODULE_STRATEGY: none


.releaseable_branches: # list of git refs for building GitLab artifacts (think "pre-release binaries")
only: &releaseable_branches
Expand Down Expand Up @@ -102,7 +97,7 @@ build-windows:
script:
- sh scripts/gitlab/build-windows.sh
tags:
- rust-windows
- rust-windows
<<: *collect_artifacts

publish-docker:
Expand Down Expand Up @@ -169,7 +164,6 @@ publish-awss3-release:
image: parity/awscli:latest
stage: publish
only: *releaseable_branches
<<: *no_git
cache: {}
dependencies:
- build-linux
Expand Down Expand Up @@ -197,7 +191,7 @@ build-android:
image: parity/rust-android:gitlab-ci
variables:
CARGO_TARGET: armv7-linux-androideabi
dependencies:
dependencies: []
script:
- scripts/gitlab/build-unix.sh
tags:
Expand Down
4 changes: 2 additions & 2 deletions scripts/gitlab/publish-aws.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ set -u # treat unset variables as error
echo "__________Push binaries to AWS S3____________"
case "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" in
(beta|stable|nightly)
export BUCKET=releases.parity.io/ethereum;
BUCKET=releases.parity.io/ethereum;
;;
(*)
export BUCKET=builds-parity;
BUCKET=builds-parity;
;;
esac
aws s3 sync ./artifacts s3://${BUCKET}/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}/
Expand Down