CI: push release branch with dist/

This commit is contained in:
Alexander Zobnin
2020-09-02 16:44:02 +03:00
parent a0d57ee8d1
commit 627007021c
2 changed files with 10 additions and 24 deletions

View File

@@ -214,26 +214,8 @@ jobs:
- add_ssh_keys: - add_ssh_keys:
fingerprints: fingerprints:
- ${GITHUB_PROJECT_SSH_KEY_FINGERPRINT} - ${GITHUB_PROJECT_SSH_KEY_FINGERPRINT}
- checkout - attach_workspace:
- restore_cache: at: ~/alexanderzobnin
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
- run: ./.circleci/make-release.sh - run: ./.circleci/make-release.sh
build-docs: build-docs:
@@ -331,6 +313,10 @@ workflows:
requires: requires:
- package-plugin - package-plugin
filters: *filter-only-release filters: *filter-only-release
- make-release-commit:
requires:
- package-plugin
filters: *filter-only-release
build-docs: build-docs:
jobs: jobs:

View File

@@ -34,11 +34,11 @@ git checkout -b "$RELEASE_BRANCH"
# make clean install dist # make clean install dist
# Commit release # Commit release
# git add --force dist/ git add --force dist/
# git commit -m "release $RELEASE_VER" git commit -m "release $RELEASE_VER"
# RELEASE_COMMIT_HASH=$(git log -n 1 | grep -Po "(?<=commit )[0-9a-z]{40}") RELEASE_COMMIT_HASH=$(git log -n 1 | grep -Po "(?<=commit )[0-9a-z]{40}")
# echo "$RELEASE_COMMIT_HASH" echo "$RELEASE_COMMIT_HASH"
# Push release branch # Push release branch
git push origin "$RELEASE_BRANCH" git push origin "$RELEASE_BRANCH"