Commit 81c1265f authored by Ivan Del Pino's avatar Ivan Del Pino Committed by Rafael Jesus Hernández Vasquez

fix(config): changes in config and scripts files

Signed-off-by: 's avatarIvan Del Pino <idelpino@teclib.com>
parent bb525644
......@@ -115,9 +115,6 @@ jobs:
- run:
name: Push changes to github
command: source ci/scripts/ci_push_changes.sh
- run:
name: Create apk
command: source ci/scripts/ci_fastlane.sh "example"
- run:
name: Create a github release
command: source ci/scripts/ci_github_release.sh
......
......@@ -29,10 +29,10 @@ GIT_TAG=$(jq -r ".version" package.json)
# git push --follow-tags origin $CIRCLE_BRANCH
# push tag to github
conventional-github-releaser -t $GH_TOKEN 2> /dev/null || true
conventional-github-releaser -p angular -t $GITHUB_TOKEN 2> /dev/null || true
# Create zip example code
sudo zip -r $CIRCLE_ARTIFACTS/java_example_code.zip app/*
sudo zip -r $CIRCLE_ARTIFACTS/java_example_code.zip example/*
# Update release name
github-release edit \
......@@ -40,20 +40,11 @@ github-release edit \
--repo $CIRCLE_PROJECT_REPONAME \
--tag ${GIT_TAG} \
--name "GLPI API REST v${GIT_TAG}" \
--description "$(git log -1 --pretty=%B)"
# Upload example code release
github-release upload \
--user $CIRCLE_PROJECT_USERNAME \
--repo $CIRCLE_PROJECT_REPONAME \
--tag ${GIT_TAG} \
--name "java_example.zip" \
--file $CIRCLE_ARTIFACTS/java_example_code.zip
# Upload example code release
github-release upload \
--user $CIRCLE_PROJECT_USERNAME \
--repo $CIRCLE_PROJECT_REPONAME \
--tag ${GIT_TAG} \
--name "app-example-${GIT_TAG}.apk" \
--file example/build/outputs/apk/app-release.apk
\ No newline at end of file
--name "java_example_${GIT_TAG}.zip" \
--file $CIRCLE_ARTIFACTS/java_example_code.zip
\ No newline at end of file
......@@ -25,17 +25,20 @@
# Push commits and tags to origin branch
git push --follow-tags origin $CIRCLE_BRANCH
# Merge back the develop branch step
# go to develop
git checkout develop
# merge with master
git rebase master
# push develop
git push origin develop
# return to master
git checkout master
\ No newline at end of file
#
## Merge back the develop branch step
#
## go to develop
#git checkout develop
#git add .
#git stash
#
## merge with master
#git rebase master
#
#
## push develop
#git push origin develop
#
## return to master
#git checkout master
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment