From 78914ce9309aea8435f212e57265d7cfe1ff0fff Mon Sep 17 00:00:00 2001 From: pulpbot Date: Sun, 12 Apr 2026 06:55:11 +0000 Subject: [PATCH] Update CI files --- .github/workflows/ci.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/scripts/before_install.sh | 6 ++++++ .github/workflows/scripts/release.sh | 3 ++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9adeff..518c627 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,7 +101,7 @@ jobs: uses: "./.github/workflows/test.yml" with: matrix_env: | - [{"TEST": "pulp"}, {"TEST": "lowerbounds"}] + [{"TEST": "pulp"}, {"TEST": "azure"}, {"TEST": "s3"}, {"TEST": "lowerbounds"}] deprecations: runs-on: "ubuntu-latest" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 073b988..0765741 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -31,7 +31,7 @@ jobs: uses: "./.github/workflows/test.yml" with: matrix_env: | - [{"TEST": "pulp"}, {"TEST": "lowerbounds"}] + [{"TEST": "pulp"}, {"TEST": "azure"}, {"TEST": "s3"}, {"TEST": "lowerbounds"}] changelog: runs-on: "ubuntu-latest" diff --git a/.github/workflows/scripts/before_install.sh b/.github/workflows/scripts/before_install.sh index 72d6517..918c20b 100755 --- a/.github/workflows/scripts/before_install.sh +++ b/.github/workflows/scripts/before_install.sh @@ -25,6 +25,12 @@ fi COMPONENT_VERSION="$(bump-my-version show current_version | tail -n -1 | python -c 'from packaging.version import Version; print(Version(input()))')" COMPONENT_SOURCE="./pulp_rust/dist/pulp_rust-${COMPONENT_VERSION}-py3-none-any.whl" +if [ "$TEST" = "s3" ]; then + COMPONENT_SOURCE="${COMPONENT_SOURCE} pulpcore[s3] git+https://github.com/gerrod3/botocore.git@fix-100-continue" +fi +if [ "$TEST" = "azure" ]; then + COMPONENT_SOURCE="${COMPONENT_SOURCE} pulpcore[azure,uvloop]" +fi if [[ "$TEST" = "pulp" ]]; then python3 .ci/scripts/calc_constraints.py -u pyproject.toml > upperbounds_constraints.txt diff --git a/.github/workflows/scripts/release.sh b/.github/workflows/scripts/release.sh index a08353c..40bbcb1 100755 --- a/.github/workflows/scripts/release.sh +++ b/.github/workflows/scripts/release.sh @@ -24,4 +24,5 @@ towncrier build --yes --version "${NEW_VERSION}" bump-my-version bump release --commit --message "Release {new_version}" --tag --tag-name "{new_version}" --tag-message "Release {new_version}" --allow-dirty bump-my-version bump patch --commit -git push origin "${BRANCH}" "${NEW_VERSION}" +# Git push is not atomic by default! +git push --atomic origin "${BRANCH}" "${NEW_VERSION}"