From 578ecc247aff126913a69d9f48b520e90ce5e445 Mon Sep 17 00:00:00 2001 From: Sebastien Roy Date: Wed, 8 May 2024 11:18:33 -0400 Subject: [PATCH] cleanup versioning --- .github/actions/bumpversion/action.yml | 7 +------ .github/workflows/merge_to_develop.yml | 6 ++++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/actions/bumpversion/action.yml b/.github/actions/bumpversion/action.yml index 1a80d77..d6e50ad 100644 --- a/.github/actions/bumpversion/action.yml +++ b/.github/actions/bumpversion/action.yml @@ -11,12 +11,7 @@ runs: shell: bash - name: push to repo run: | - mkdir -p ~/.ssh - echo "${QCOG_DEPLOY_PUSH_KEY}" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - git commit -m "Bump version: $(git tag -l --sort=creatordate | tail -n 1) → $(python -m setuptools_scm --strip-dev) [skip ci]" + git commit -m "Bump version: $(git tag -l --sort=creatordate | tail -n 1) → $(python -m setuptools_scm --strip-dev) [skip ci]" git tag $(python -m setuptools_scm --strip-dev) - git push git@github.com:${GITHUB_REPOSITORY} - git push --tags git@github.com:${GITHUB_REPOSITORY} shell: bash diff --git a/.github/workflows/merge_to_develop.yml b/.github/workflows/merge_to_develop.yml index 6289a5d..30c5049 100644 --- a/.github/workflows/merge_to_develop.yml +++ b/.github/workflows/merge_to_develop.yml @@ -17,10 +17,12 @@ jobs: fetch-depth: 0 - name: Setup python, Lint Code and test uses: ./.github/actions/setup_and_lint - - name: Build and install our repo - uses: ./.github/actions/python-build - name: Bump version uses: ./.github/actions/bumpversion + - name: Build and install our repo + uses: ./.github/actions/python-build + - name: Push version + uses: ./.github/actions/pushversion env: QCOG_DEPLOY_PUSH_KEY: ${{ secrets.QCOG_DEPLOY_PUSH_KEY }} - name: Configure aws credentials