Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update CI files for branch main #297

Merged
merged 1 commit into from
Jul 22, 2024
Merged

Update CI files for branch main #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .ci/ansible/Containerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ ADD ./{{ item.name }} ./{{ item.name }}
# S3 botocore needs to be patched to handle responses from minio during 0-byte uploads
# Hacking botocore (https://github.com/boto/botocore/pull/1990)

RUN pip3 install
RUN pip3 install --upgrade pip setuptools wheel && \
rm -rf /root/.cache/pip && \
pip3 install
{%- if s3_test | default(false) -%}
{{ " " }}git+https://github.com/gerrod3/botocore.git@fix-100-continue
{%- endif -%}
Expand All @@ -25,7 +27,8 @@ RUN pip3 install
{{ " " }}-r ./{{ item.name }}/ci_requirements.txt
{%- endif -%}
{%- endfor %}
{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt
{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt && \
rm -rf /root/.cache/pip

{% if pulp_env is defined and pulp_env %}
{% for key, value in pulp_env.items() %}
Expand Down
2 changes: 2 additions & 0 deletions .ci/scripts/calc_constraints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ def to_upper_bound(req):
max_version = f"{version.major}.{version.minor}.{version.micro-1}"
elif version.minor != 0:
max_version = f"{version.major}.{version.minor-1}"
elif version.major != 0:
max_version = f"{version.major-1}.0"
else:
return f"# NO BETTER CONSTRAINT: {req}"
return f"{requirement.name}{operator}{max_version}"
Expand Down
2 changes: 1 addition & 1 deletion .github/template_gitref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.08.26-354-g82d22de
2021.08.26-361-gcd6f9f0
4 changes: 1 addition & 3 deletions .github/workflows/scripts/build_python_client.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ cd "$(dirname "$(realpath -e "$0")")"/../../..
pushd ../pulp-openapi-generator
rm -rf "pulp_gem-client"

# We need to copy that over to be visible in the container.
cp "../pulp_gem/gem-api.json" .
./gen-client.sh "gem-api.json" "gem" python "pulp_gem"
./gen-client.sh "../pulp_gem/gem-api.json" "gem" python "pulp_gem"

pushd pulp_gem-client
python setup.py sdist bdist_wheel --python-tag py3
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/scripts/build_ruby_client.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,7 @@ cd "$(dirname "$(realpath -e "$0")")"/../../..
pushd ../pulp-openapi-generator
rm -rf "pulp_gem-client"

# We need to copy that over to be visible in the container.
#cp "../pulp_gem/gem-api.json" .
#./gen-client.sh "gem-api.json" "gem" ruby "pulp_gem"

# -------------
# The generator still needs to have it called api.json at this time...
cp "../pulp_gem/api.json" .
./gen-client.sh "api.json" "gem" ruby "pulp_gem"
# -------------
./gen-client.sh "../pulp_gem/gem-api.json" "gem" ruby "pulp_gem"

pushd pulp_gem-client
gem build pulp_gem_client
Expand Down
2 changes: 1 addition & 1 deletion docs/template_gitref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.08.26-354-g82d22de
2021.08.26-361-gcd6f9f0
Loading