Skip to content

Commit 79b2858

Browse files
authored
Merge pull request #670 from pulp/update-ci/main
Update CI files for branch main
2 parents fa9cdb6 + 242cbdc commit 79b2858

File tree

5 files changed

+25
-10
lines changed

5 files changed

+25
-10
lines changed

.github/template_gitref

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2021.08.26-330-g0b7d0c1
1+
2021.08.26-335-gdf91f79

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,4 @@ jobs:
4242
path: "pulp_python/dist/"
4343
if-no-files-found: "error"
4444
retention-days: 5
45+
overwrite: true

.github/workflows/publish.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,25 +88,32 @@ jobs:
8888
run: |
8989
.github/workflows/scripts/install_ruby_client.sh
9090
shell: "bash"
91+
9192
- name: "Upload python client packages"
9293
uses: "actions/upload-artifact@v4"
9394
with:
9495
name: "python-client.tar"
95-
path: "pulp_python/python-python-client.tar"
96+
path: |
97+
pulp_python/python-python-client.tar
9698
if-no-files-found: "error"
99+
overwrite: true
97100

98101
- name: "Upload python client docs"
99102
uses: "actions/upload-artifact@v4"
100103
with:
101104
name: "python-client-docs.tar"
102-
path: "pulp_python/python-python-client-docs.tar"
105+
path: |
106+
pulp_python/python-python-client-docs.tar
103107
if-no-files-found: "error"
108+
overwrite: true
104109
- name: "Upload ruby client packages"
105110
uses: "actions/upload-artifact@v4"
106111
with:
107112
name: "ruby-client.tar"
108-
path: "pulp_python/python-ruby-client.tar"
113+
path: |
114+
pulp_python/python-ruby-client.tar
109115
if-no-files-found: "error"
116+
overwrite: true
110117
- name: Build docs
111118
run: |
112119
export DJANGO_SETTINGS_MODULE=pulpcore.app.settings
@@ -119,6 +126,8 @@ jobs:
119126
with:
120127
name: "docs.tar"
121128
path: "pulp_python/docs/docs.tar"
129+
if-no-files-found: "error"
130+
overwrite: true
122131

123132
- name: "Logs"
124133
if: always()

.github/workflows/scripts/publish_client_pypi.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@ RESPONSE="$(curl --write-out '%{http_code}' --silent --output /dev/null "https:/
2424
if [ "$RESPONSE" == "200" ];
2525
then
2626
echo "pulp_python client $VERSION has already been released. Skipping."
27-
exit
27+
else
28+
twine upload -u __token__ -p "$PYPI_API_TOKEN" \
29+
"dist/pulp_python_client-$VERSION-py3-none-any.whl" \
30+
"dist/pulp_python-client-$VERSION.tar.gz"
2831
fi
29-
30-
twine upload -u __token__ -p "$PYPI_API_TOKEN" \
31-
"dist/pulp_python_client-$VERSION-py3-none-any.whl" \
32-
"dist/pulp_python-client-$VERSION.tar.gz" \
33-
;

.github/workflows/test.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ jobs:
125125
path: "pulp_python/deprecations-${{ matrix.env.TEST }}.txt"
126126
if-no-files-found: "error"
127127
retention-days: 5
128+
overwrite: true
128129
- name: Upload python client packages
129130
if: ${{ env.TEST == 'pulp' }}
130131
uses: actions/upload-artifact@v4
@@ -133,6 +134,7 @@ jobs:
133134
path: "pulp_python/python-python-client.tar"
134135
if-no-files-found: "error"
135136
retention-days: 5
137+
overwrite: true
136138

137139
- name: Upload python client docs
138140
if: ${{ env.TEST == 'pulp' }}
@@ -142,6 +144,7 @@ jobs:
142144
path: "pulp_python/python-python-client-docs.tar"
143145
if-no-files-found: "error"
144146
retention-days: 5
147+
overwrite: true
145148
- name: Upload Ruby client
146149
if: ${{ env.TEST == 'pulp' }}
147150
uses: actions/upload-artifact@v4
@@ -150,12 +153,16 @@ jobs:
150153
path: "pulp_python/python-ruby-client.tar"
151154
if-no-files-found: "error"
152155
retention-days: 5
156+
overwrite: true
153157
- name: Upload built docs
154158
if: ${{ env.TEST == 'docs' }}
155159
uses: actions/upload-artifact@v4
156160
with:
157161
name: "docs.tar"
158162
path: "pulp_python/docs/docs.tar"
163+
if-no-files-found: "error"
164+
retention-days: 5
165+
overwrite: true
159166

160167
- name: "Logs"
161168
if: always()

0 commit comments

Comments
 (0)