From f2f6b4546621e6b993c88ae37f6abc2ab9635a5d Mon Sep 17 00:00:00 2001 From: Alejandro Esquivel Date: Thu, 27 Oct 2022 18:07:26 -0700 Subject: [PATCH] Bumped aws plugins version to new stable release (#49) * Bumped aws plugins version to new stable release * Updated version workflow to use re-usable workflow --- .github/workflows/version.yml | 51 +++-------------------------------- CHANGELOG.md | 4 +++ requirements.txt | 3 +-- 3 files changed, 8 insertions(+), 50 deletions(-) diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml index 51d005b..080b8c6 100644 --- a/.github/workflows/version.yml +++ b/.github/workflows/version.yml @@ -27,51 +27,6 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out head - uses: actions/checkout@v1 - with: - fetch-depth: 0 - - name: Check git history - run: | - if git merge-base --is-ancestor $GITHUB_SHA origin/develop; then - echo "DEVELOP_COMMIT_HISTORY=$GITHUB_SHA" >> $GITHUB_ENV - fi - - name: Check for version change - id: changed-version-file - uses: tj-actions/changed-files@v18.4 - with: - files: | - VERSION - - name: Fail if version changed - if: ${{ steps.changed-version-file.outputs.any_changed == 'true' && github.sha != env.DEVELOP_COMMIT_HISTORY }} - run: | - echo "Version changes are prohibited in pull requests." - exit 10 - - name: Read head version - if: ${{ github.sha != env.DEVELOP_COMMIT_HISTORY }} - run: | - HEAD_VERSION="$(cat ./VERSION)" - echo "HEAD_VERSION=$HEAD_VERSION" >> $GITHUB_ENV - - name: Validate changelog entry - if: ${{ github.sha != env.DEVELOP_COMMIT_HISTORY }} - run: | - git diff --name-only origin/develop | grep CHANGELOG - unreleased_header_line=8 - if [[ $(sed "${unreleased_header_line}q;d" CHANGELOG.md) != "## [UNRELEASED]" ]] ; then - echo 'Removing the [UNRELEASED] header is prohibited in pull requests.' - exit 4 - fi - latest_release=$(sed -n "/\[[0-9]\+\.[0-9]\+\.[0-9]\+\]/=" CHANGELOG.md | head -n 1) - IFS='[]' read -ra changelog_version <<< $(sed "${latest_release}q;d" CHANGELOG.md) - if [[ "${changelog_version[1]}" != $HEAD_VERSION ]] ; then - echo 'The most recent CHANGELOG release does not match the VERSION'. - exit 3 - fi - #Check that the lines in the diff are between unreleased_header_line and latest_release - IFS='@-+,' read -ra LINES <<< "$(git diff develop -- CHANGELOG.md | sed '5q;d')" - start_head="$(( LINES[5] + 3 ))" - lines_head="$(( LINES[6] - 6 ))" - if [[ $start_head -lt $unreleased_header_line ]] || - [[ $((start_head + lines_head)) -gt $latest_release ]] ; then - echo 'Changes outside the UNRELEASED block are prohibited in pull requests.' - exit 6 - fi + uses: actions/checkout@v3 + - name: Validate Version + uses: AgnostiqHQ/covalent/.github/actions/version@develop diff --git a/CHANGELOG.md b/CHANGELOG.md index 7995a3f..5c632bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [UNRELEASED] +### Changed + +- Bumped aws plugins version to new stable release + ## [0.20.0] - 2022-10-27 ### Changed diff --git a/requirements.txt b/requirements.txt index 8237860..094feae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ boto3==1.24.35 -covalent-aws-plugins>=0.7.0rc0 -docker==5.0.3 +covalent-aws-plugins>=0.12.0,<1