Skip to content

Commit c77ebe1

Browse files
pulpbotggainey
authored andcommitted
Update CI files
[noissue]
1 parent 4dc0f70 commit c77ebe1

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.ci/ansible/Containerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM {{ ci_base | default("ghcr.io/pulp/pulp-ci-centos:" + pulp_container_tag) }
33
# Add source directories to container
44
{% for item in plugins %}
55
{% if item.source.startswith("./") or item.ci_requirements | default(false) %}
6-
ADD ./{{ item.name }} {{ item.source }}
6+
ADD ./{{ item.name }} ./{{ item.name }}
77
{% endif %}
88
{% endfor %}
99

.ci/scripts/calc_deps_lowerbounds.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,12 @@ def main():
1919
else:
2020
for spec in requirement.specifier:
2121
if spec.operator == ">=":
22+
if requirement.name == "pulpcore":
23+
operator = "~="
24+
else:
25+
operator = "=="
2226
min_version = str(spec)[2:]
23-
print(f"{requirement.name}=={min_version}")
27+
print(f"{requirement.name}{operator}{min_version}")
2428
break
2529
else:
2630
print(line.strip())

.github/template_gitref

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2021.08.26-204-g11c3bc9
1+
2021.08.26-207-g81d81f6

.github/workflows/release.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
run: python .github/workflows/scripts/release.py ${{ github.event.inputs.release }}
5959

6060
- name: 'Tar files'
61-
run: tar -cvf pulpcore.tar $GITHUB_WORKSPACE
61+
run: tar -cvf pulpcore.tar .
6262

6363
- name: 'Upload Artifact'
6464
uses: actions/upload-artifact@v3
@@ -95,9 +95,7 @@ jobs:
9595

9696
- name: Untar repository
9797
run: |
98-
shopt -s dotglob
9998
tar -xf pulpcore.tar
100-
mv home/runner/work/pulpcore/pulpcore/* ./
10199
102100
# update to the branch's latest ci files rather than the ones from the release tag. this is
103101
# helpful when there was a problem with the ci files during the release which needs to be
@@ -260,9 +258,7 @@ jobs:
260258
261259
- name: Untar repository
262260
run: |
263-
shopt -s dotglob
264261
tar -xf pulpcore.tar
265-
mv home/runner/work/pulpcore/pulpcore/* ./
266262
267263
# update to the branch's latest ci files rather than the ones from the release tag. this is
268264
# helpful when there was a problem with the ci files during the release which needs to be

0 commit comments

Comments
 (0)