From 37d56ec30801a0908d8a5c7dcd0a856a7a333f3d Mon Sep 17 00:00:00 2001 From: Alejandro Esquivel Date: Mon, 17 Oct 2022 17:55:02 -0700 Subject: [PATCH] Consolidate pre & stable build into one step in release workflow (#1358) * Adding pre suffix if pre-release during validate distribution step * Updated CHANGELOG * Consolidated pre & stable build into one step in release.yml * Updated changelog --- .github/workflows/release.yml | 15 ++++----------- CHANGELOG.md | 4 ++++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4cd0311f3..86806bb43 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -186,15 +186,9 @@ jobs: cd ./covalent_ui/webapp yarn install yarn build - - name: Build Prerelease Distribution - if: inputs.prerelease - id: pre-build - run: python setup.py egg_info --tag-build=pre sdist - - name: Build Stable Distribution - if: > - github.event.inputs.stable_version - && contains(env.PAUL_BLART, github.actor) - id: stable-build + - name: Build Stable or Pre-Release Distribution + if: contains(env.PAUL_BLART, github.actor) + id: pre-or-stable-build run: python setup.py sdist - name: Transform semver version to pep440 id: version-transform @@ -221,8 +215,7 @@ jobs: echo "::set-output name=version::$VERSION" - name: Upload Distribution if: > - steps.pre-build.outcome == 'success' - || steps.stable-build.outcome == 'success' + steps.pre-or-stable-build.outcome == 'success' && steps.validate.outcome == 'success' && ${{ !github.event.inputs.test_release }} env: diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fa242e9f..6c2d8cb88 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] +### Operations + +- Consolidated pre & stable build into one step in release.yml + ## [0.204.0-rc.0] - 2022-10-17 ### Authors