Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

revert some changes, could be buggy #10399

Merged
TriplEight merged 8 commits into from
Feb 21, 2019
Merged

revert some changes, could be buggy #10399

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6018089
no-git for publish jobs, empty artifacts dir
TriplEight Feb 21, 2019
a2407a3
fix syntax
TriplEight Feb 21, 2019
cc0c8f3
prettiness
TriplEight Feb 21, 2019
8a66196
fix prettiness
TriplEight Feb 21, 2019
518c9d9
should get rid of git in publishing
TriplEight Feb 21, 2019
a62b940
should get rid of git in publishing, some fixes
TriplEight Feb 21, 2019
1268855
can't drop git in publish jobs yet
TriplEight Feb 21, 2019
88ce554
Merge branch 'master' into fix-ci_307
TriplEight Feb 21, 2019
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
29 changes: 5 additions & 24 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ variables:
when: on_success
expire_in: 1 mos
paths:
- artifacts/
- artifacts/

.determine_version: &determine_version
- VERSION="$(sed -r -n '1,/^version/s/^version = "([^"]+)".*$/\1/p' Cargo.toml)"
Expand Down Expand Up @@ -99,7 +99,7 @@ build-windows:
publish-docker:
stage: publish
only: *releaseable_branches
<<: *no_git
# <<: *no_git
Copy link
Copy Markdown
Contributor

@soc1c soc1c Feb 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please remove it or not

Copy link
Copy Markdown
Contributor

@General-Beck General-Beck Feb 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove

cache: {}
dependencies:
- build-linux
Expand Down Expand Up @@ -129,7 +129,7 @@ publish-snap:
publish-onchain:
stage: publish
only: *releaseable_branches
<<: *no_git
# <<: *no_git
cache: {}
dependencies:
- build-linux
Expand All @@ -140,23 +140,6 @@ publish-onchain:
tags:
- linux-docker

# configures aws for fast uploads/syncs
.s3-before-script: &s3-before-script
Copy link
Copy Markdown
Contributor

@soc1c soc1c Feb 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this being removed?

Copy link
Copy Markdown
Contributor

@General-Beck General-Beck Feb 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved to docker parity/awscli @TriplEight ?

Copy link
Copy Markdown
Contributor

@gabreal gabreal Feb 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's here now

before_script:
- mkdir -p ${HOME}/.aws
- |
cat > ${HOME}/.aws/config <<EOC
[default]
s3 =
max_concurrent_requests = 20
max_queue_size = 10000
multipart_threshold = 64MB
multipart_chunksize = 16MB
max_bandwidth = 50MB/s
use_accelerate_endpoint = false
addressing_style = path
EOC

publish-awss3-release:
image: parity/awscli:latest
stage: publish
Expand All @@ -167,9 +150,6 @@ publish-awss3-release:
- build-linux
- build-darwin
- build-windows
variables:
GIT_STRATEGY: none
<<: *s3-before-script
script:
- echo "__________Push binaries to AWS S3____________"
- case "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" in
Expand All @@ -185,10 +165,11 @@ publish-awss3-release:
- aws s3 ls s3://${BUCKET}/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}/
--recursive --human-readable --summarize
tags:
- linux-docker
- linux-docker

publish-docs:
stage: publish
# <<: *no_git
only:
- tags
except:
Expand Down