Skip to content

Commit

Permalink
Hopefully fixing some oopsies
Browse files Browse the repository at this point in the history
  • Loading branch information
nicholaschiasson committed Jul 21, 2019
1 parent 98a0bce commit dff9a4a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ publish:tag:
script:
- apk add --update --no-cache curl
- npm install -g semver
- curl -qsX POST -H "Private-Token:${GITLAB_API_TOKEN}" -F ref="${CI_COMMIT_REF_NAME}" -F tag_name="$(cat "${VERSION_FILE}")" "https://gitlab.com/api/v4/projects/${CI_PROJECT_ID}/repository/tags" > /dev/null 2>&1
- curl -qsX POST -H "Private-Token:${GITLAB_API_TOKEN}" -F ref="${CI_COMMIT_SHA}" -F tag_name="$(cat "${VERSION_FILE}")" "https://gitlab.com/api/v4/projects/${CI_PROJECT_ID}/repository/tags" > /dev/null 2>&1
only:
- master

Expand Down
17 changes: 12 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
if: tag IS present AND tag != latest

os:
- linux
- osx
- windows

git:
depth: false

Expand All @@ -26,10 +21,18 @@ cache: cargo
jobs:
include:
- stage: build
os:
- linux
- osx
- windows
before_script: sed -i "s/version = \"0.0.0\"/version = \"$(VERSION=${TRAVIS_TAG} ./version.sh tags)\"/" Cargo.toml
script:
- cargo build --verbose --release
- stage: deploy
os:
- linux
- osx
- windows
deploy:
provider: releases
api_key:
Expand All @@ -39,6 +42,10 @@ jobs:
on:
tags: true
- stage: deploy
os:
- linux
- osx
- windows
env:
- TRAVIS_TAG=latest
deploy:
Expand Down

0 comments on commit dff9a4a

Please sign in to comment.