diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 323f7242..eec66604 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ stages: variables: GIT_SUBMODULE_STRATEGY: recursive - GITLAB_URL: "https://framagit.org" + GITLAB_URL: "framagit.org" ANDROID_SDK_TOOLS: "4333796" ANDROID_HOME: "$CI_PROJECT_DIR/.android-sdk" @@ -97,14 +97,20 @@ release: - wget --quiet --output-document=/tmp/nvm-install.sh https://raw.githubusercontent.com/creationix/nvm/v0.33.6/install.sh - bash /tmp/nvm-install.sh - export NVM_DIR="$HOME/.nvm" &&. "$NVM_DIR/nvm.sh" && nvm install 8 - cache: {} - script: - - npm install -g semantic-release @semantic-release/commit-analyzer @semantic-release/release-notes-generator @semantic-release/changelog @semantic-release/exec @semantic-release/git @semantic-release/gitlab - eval $(ssh-agent -s) - - echo "$GIT_SSH_KEY" | tr -d '\r' | ssh-add - > /dev/null - #- ssh-add -q <(echo "$GIT_SSH_KEY") + #- echo "$GIT_SSH_KEY" | tr -d '\r' | ssh-add - > /dev/null + - ssh-add -q <(echo "$GIT_SSH_KEY") - mkdir -p ~/.ssh && ssh-keyscan $GITLAB_URL >> ~/.ssh/known_hosts - git config --global user.email $GIT_AUTHOR_EMAIL - git config --global user.name $GIT_AUTHOR_NAME + cache: {} + script: + - npm install -g semantic-release @semantic-release/commit-analyzer @semantic-release/release-notes-generator @semantic-release/changelog @semantic-release/exec @semantic-release/git @semantic-release/gitlab - semantic-release - - git checkout develop && git rebase master && git push origin develop + - echo $CI_PROJECT_URL + - echo $CI_REPOSITORY_URL + - echo $CI_PROJECT_PATH + - echo $CI_PROJECT_PATH_SLUG + - git checkout develop && git rebase master && git push develop + #- git push git@${GITLAB_URL}:${CI_PROJECT_PATH_SLUG}.git develop + #- git push https://${GIT_USERNAME}:${GIT_ACCESS_TOKEN}@${GITLAB_URL}/${CI_PROJECT_PATH_SLUG}.git develop