diff --git a/.circleci/config.yml b/.circleci/config.yml index fd5b739..1d0597b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -214,26 +214,8 @@ jobs: - add_ssh_keys: fingerprints: - ${GITHUB_PROJECT_SSH_KEY_FINGERPRINT} - - checkout - - restore_cache: - keys: - - dependency-cache-npm-{{ checksum "yarn.lock" }} - - restore_cache: - keys: - - dependency-cache-go-{{ checksum "go.sum" }} - - run: - name: Install Dependencies - command: 'make install' - no_output_timeout: 15m - - save_cache: - key: dependency-cache-npm-{{ checksum "yarn.lock" }} - paths: - - ./node_modules - - save_cache: - key: dependency-cache-go-{{ checksum "go.sum" }} - paths: - - ./vendor - - /go/pkg/mod + - attach_workspace: + at: ~/alexanderzobnin - run: ./.circleci/make-release.sh build-docs: @@ -331,6 +313,10 @@ workflows: requires: - package-plugin filters: *filter-only-release + - make-release-commit: + requires: + - package-plugin + filters: *filter-only-release build-docs: jobs: diff --git a/.circleci/make-release.sh b/.circleci/make-release.sh index bcaab7b..b0d5a9e 100755 --- a/.circleci/make-release.sh +++ b/.circleci/make-release.sh @@ -34,11 +34,11 @@ git checkout -b "$RELEASE_BRANCH" # make clean install dist # Commit release -# git add --force dist/ -# git commit -m "release $RELEASE_VER" +git add --force dist/ +git commit -m "release $RELEASE_VER" -# RELEASE_COMMIT_HASH=$(git log -n 1 | grep -Po "(?<=commit )[0-9a-z]{40}") -# echo "$RELEASE_COMMIT_HASH" +RELEASE_COMMIT_HASH=$(git log -n 1 | grep -Po "(?<=commit )[0-9a-z]{40}") +echo "$RELEASE_COMMIT_HASH" # Push release branch git push origin "$RELEASE_BRANCH"