Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tarantool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
tarantool
Commits
5b8e5329
Commit
5b8e5329
authored
7 years ago
by
Roman Tsisyk
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/1.6' into 1.7
parents
a4e8cb53
93ca0007
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.travis.yml
+3
-2
3 additions, 2 deletions
.travis.yml
extra/deploy_key.enc
+0
-0
0 additions, 0 deletions
extra/deploy_key.enc
with
3 additions
and
2 deletions
.travis.yml
+
3
−
2
View file @
5b8e5329
...
...
@@ -83,6 +83,7 @@ script:
before_deploy
:
-
ls -l build/
-
pip install awscli --user
deploy
:
# Deploy packages to PackageCloud
...
...
@@ -96,9 +97,9 @@ deploy:
on
:
branch
:
"
1.7"
condition
:
-n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
# Deploy sources to S
FTP
# Deploy sources to S
3
-
provider
:
script
script
:
./packpack/tools/sftp
${TRAVIS_BRANCH}
/
src
build/*.tar.gz
script
:
aws --endpoint-url "${AWS_S3_ENDPOINT_URL}" s3 cp build/*.tar.gz "s3://tarantool-
${TRAVIS_BRANCH}
-
src
/" --acl public-read
skip_cleanup
:
true
on
:
branch
:
"
1.7"
...
...
This diff is collapsed.
Click to expand it.
extra/deploy_key.enc
deleted
100644 → 0
+
0
−
0
View file @
a4e8cb53
File deleted
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment