From 352c6300286b96ffc3678924c3f62e3ac22be09e Mon Sep 17 00:00:00 2001 From: Jed Cunningham Date: Wed, 25 May 2022 15:34:15 -0600 Subject: [PATCH] Make CI and PROD image builds consistent Simple refactoring to make the jobs more consistent. --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ee55a88d7f16..54e9481396d74 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -309,8 +309,6 @@ jobs: with: python-version: ${{ needs.build-info.outputs.defaultPythonVersion }} if: needs.build-info.outputs.inWorkflowBuild == 'true' - - run: ./scripts/ci/install_breeze.sh - if: needs.build-info.outputs.inWorkflowBuild == 'true' - name: "Retrieve DEFAULTS from the _initialization.sh" # We cannot "source" the script here because that would be a security problem (we cannot run # any code that comes from the sources coming from the PR. Therefore we extract the @@ -328,6 +326,8 @@ jobs: awk 'BEGIN{FS="="} {print $3}' | sed s'/["}]//g') echo "DEBIAN_VERSION=${DEBIAN_VERSION}" >> $GITHUB_ENV if: needs.build-info.outputs.inWorkflowBuild == 'true' + - run: ./scripts/ci/install_breeze.sh + if: needs.build-info.outputs.inWorkflowBuild == 'true' - name: "Free space" run: breeze free-space if: needs.build-info.outputs.inWorkflowBuild == 'true' @@ -392,7 +392,7 @@ jobs: awk 'BEGIN{FS="="} {print $3}' | sed s'/["}]//g') echo "DEFAULT_CONSTRAINTS_BRANCH=${DEFAULT_CONSTRAINTS_BRANCH}" >> $GITHUB_ENV DEBIAN_VERSION=$(grep "export DEBIAN_VERSION" scripts/ci/libraries/_initialization.sh | \ - cut -d "=" -f 3 | sed s'/["}]//g') + awk 'BEGIN{FS="="} {print $3}' | sed s'/["}]//g') echo "DEBIAN_VERSION=${DEBIAN_VERSION}" >> $GITHUB_ENV if: needs.build-info.outputs.inWorkflowBuild == 'true' - run: ./scripts/ci/install_breeze.sh