diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index 62907c9..b50b2f4 100644 --- a/.github/workflows/test-and-release.yml +++ b/.github/workflows/test-and-release.yml @@ -68,9 +68,11 @@ jobs: password: ${{ secrets.QUAY_PASSWORD }} - name: Build, bundle, and push (develop) run: | + pip3 install --user --upgrade setuptools wheel pip hack/operate.sh --push-images --bundle --develop --verbose --formatter if: github.ref == 'refs/heads/develop' - name: Build, bundle, and push run: | + pip3 install --user --upgrade setuptools wheel pip hack/operate.sh --push-images --bundle --extra-tag=latest --verbose --formatter if: github.ref == 'refs/heads/main' diff --git a/hack/operate.sh b/hack/operate.sh index 0d0c3ee..42f6fd1 100755 --- a/hack/operate.sh +++ b/hack/operate.sh @@ -308,9 +308,9 @@ function update_components() { # Ensure we have the things we need to work with the operator-sdk if [ -z "$components_updated" ]; then if [ "$VIRTUAL_ENV" ]; then - error_run "Updating the Operator SDK manager" pip install --upgrade osdk-manager || return 1 + error_run "Updating the Operator SDK manager" 'pip3 install --upgrade -r "$SCRIPT_ROOT/requirements.txt"' || return 1 else - error_run "Updating the Operator SDK manager" pip install --user --upgrade osdk-manager || return 1 + error_run "Updating the Operator SDK manager" 'pip3 install --user --upgrade -r "$SCRIPT_ROOT/requirements.txt"' || return 1 fi error_run "Updating the Operator SDK" 'sdk_version=$(osdk-manager osdk update -vvvv | cut -d" " -f 3)' || return 1 fi diff --git a/hack/requirements.txt b/hack/requirements.txt new file mode 100644 index 0000000..d98bb92 --- /dev/null +++ b/hack/requirements.txt @@ -0,0 +1 @@ +osdk-manager >= 0.3.1, == 0.3.*