Skip to content

Commit fcabd86

Browse files
lithoruslithorus
authored
[CI] remove docker images and cleanup artifact uploads (AcademySoftwareFoundation#1868)
**Summarize your changes.** - Removes the building and pushing the docker images, other than cuebot during pushing to master and at release. - Uploads `.whl` files as part of the release instead of the deprecated `tar.gz` files.
1 parent 523efff commit fcabd86

File tree

2 files changed

+30
-42
lines changed

2 files changed

+30
-42
lines changed

‎.github/workflows/packaging-pipeline.yml‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -87,34 +87,11 @@ jobs:
8787
- build_opencue_packages
8888
strategy:
8989
matrix:
90-
component: [cuebot, rqd]
9190
include:
9291
- component: cuebot
9392
NAME: Cuebot
9493
ARTIFACTS: cuebot-${BUILD_ID}-all.jar opencue-cuebot-${BUILD_ID}-1.noarch.rpm
9594

96-
- component: rqd
97-
NAME: RQD
98-
99-
- component: cuegui
100-
NAME: CueGUI
101-
102-
- component: pycue
103-
NAME: PyCue
104-
105-
- component: pyoutline
106-
NAME: PyOutline
107-
108-
- component: cuesubmit
109-
NAME: CueSubmit
110-
111-
- component: cueadmin
112-
NAME: CueAdmin
113-
114-
# Disable docker builds for now, due to missing target repo.
115-
# - component: cueman
116-
# NAME: CueMan
117-
11895
name: Build ${{ matrix.NAME }}
11996
runs-on: ubuntu-22.04
12097
steps:
@@ -251,6 +228,7 @@ jobs:
251228
aws s3 cp ${{ needs.build_opencue_packages.outputs.opencue_cueadmin_path }} s3://${S3_BUCKET}/opencue/${BUILD_ID}/
252229
aws s3 cp ${{ needs.build_opencue_packages.outputs.opencue_cueman_path }} s3://${S3_BUCKET}/opencue/${BUILD_ID}/
253230
aws s3 cp ${{ needs.build_opencue_packages.outputs.opencue_cuesubmit_path }} s3://${S3_BUCKET}/opencue/${BUILD_ID}/
231+
aws s3 cp ${{ needs.build_opencue_packages.outputs.opencue_cuegui_path }} s3://${S3_BUCKET}/opencue/${BUILD_ID}/
254232
aws s3 cp LICENSE s3://${S3_BUCKET}/opencue/${BUILD_ID}/
255233
aws s3 cp VERSION s3://${S3_BUCKET}/opencue/${BUILD_ID}/
256234
aws s3 cp "${GITHUB_WORKSPACE}/artifacts/schema-${BUILD_ID}.sql" s3://${S3_BUCKET}/opencue/${BUILD_ID}/

‎.github/workflows/release-pipeline.yml‎

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
environment: dockerhub
7373
strategy:
7474
matrix:
75-
component: [cuebot, rqd, pycue, pyoutline, cuegui, cuesubmit, cueadmin]
75+
component: [cuebot]
7676

7777
name: Release ${{ matrix.component }} Docker image
7878
steps:
@@ -251,62 +251,72 @@ jobs:
251251
asset_name: opencue-cuebot-${{ env.BUILD_ID }}-1.noarch.rpm
252252
asset_content_type: application/octet-stream
253253

254-
- name: Upload RQD Tar
254+
- name: Upload RQD package
255255
uses: actions/upload-release-asset@v1
256256
env:
257257
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
258258
with:
259259
upload_url: ${{ steps.create_release.outputs.upload_url }}
260-
asset_path: ${{ github.workspace }}/artifacts/rqd-${{ env.BUILD_ID }}-all.tar.gz
261-
asset_name: rqd-${{ env.BUILD_ID }}-all.tar.gz
260+
asset_path: ${{ github.workspace }}/artifacts/rqd-${{ env.BUILD_ID }}-py2.py3-none-any.whl
261+
asset_name: rqd-${{ env.BUILD_ID }}-py2.py3-none-any.whl
262262
asset_content_type: application/octet-stream
263263

264-
- name: Upload CueGUI Tar
264+
- name: Upload CueGUI package
265265
uses: actions/upload-release-asset@v1
266266
env:
267267
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
268268
with:
269269
upload_url: ${{ steps.create_release.outputs.upload_url }}
270-
asset_path: ${{ github.workspace }}/artifacts/cuegui-${{ env.BUILD_ID }}-all.tar.gz
271-
asset_name: cuegui-${{ env.BUILD_ID }}-all.tar.gz
270+
asset_path: ${{ github.workspace }}/artifacts/cuegui-${{ env.BUILD_ID }}-py2.py3-none-any.whl
271+
asset_name: cuegui-${{ env.BUILD_ID }}-py2.py3-none-any.whl
272272
asset_content_type: application/octet-stream
273273

274-
- name: Upload PyCue Tar
274+
- name: Upload PyCue package
275275
uses: actions/upload-release-asset@v1
276276
env:
277277
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
278278
with:
279279
upload_url: ${{ steps.create_release.outputs.upload_url }}
280-
asset_path: ${{ github.workspace }}/artifacts/pycue-${{ env.BUILD_ID }}-all.tar.gz
281-
asset_name: pycue-${{ env.BUILD_ID }}-all.tar.gz
280+
asset_path: ${{ github.workspace }}/artifacts/pycue-${{ env.BUILD_ID }}-py2.py3-none-any.whl
281+
asset_name: pycue-${{ env.BUILD_ID }}-py2.py3-none-any.whl
282282
asset_content_type: application/octet-stream
283283

284-
- name: Upload PyOutline Tar
284+
- name: Upload PyOutline package
285285
uses: actions/upload-release-asset@v1
286286
env:
287287
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
288288
with:
289289
upload_url: ${{ steps.create_release.outputs.upload_url }}
290-
asset_path: ${{ github.workspace }}/artifacts/pyoutline-${{ env.BUILD_ID }}-all.tar.gz
291-
asset_name: pyoutline-${{ env.BUILD_ID }}-all.tar.gz
290+
asset_path: ${{ github.workspace }}/artifacts/pyoutline-${{ env.BUILD_ID }}-py2.py3-none-any.whl
291+
asset_name: pyoutline-${{ env.BUILD_ID }}-py2.py3-none-any.whl
292292
asset_content_type: application/octet-stream
293293

294-
- name: Upload CueSubmit Tar
294+
- name: Upload CueSubmit package
295295
uses: actions/upload-release-asset@v1
296296
env:
297297
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
298298
with:
299299
upload_url: ${{ steps.create_release.outputs.upload_url }}
300-
asset_path: ${{ github.workspace }}/artifacts/cuesubmit-${{ env.BUILD_ID }}-all.tar.gz
301-
asset_name: cuesubmit-${{ env.BUILD_ID }}-all.tar.gz
300+
asset_path: ${{ github.workspace }}/artifacts/cuesubmit-${{ env.BUILD_ID }}-py2.py3-none-any.whl
301+
asset_name: cuesubmit-${{ env.BUILD_ID }}-py2.py3-none-any.whl
302302
asset_content_type: application/octet-stream
303303

304-
- name: Upload CueAdmin Tar
304+
- name: Upload CueAdmin package
305305
uses: actions/upload-release-asset@v1
306306
env:
307307
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
308308
with:
309309
upload_url: ${{ steps.create_release.outputs.upload_url }}
310-
asset_path: ${{ github.workspace }}/artifacts/cueadmin-${{ env.BUILD_ID }}-all.tar.gz
311-
asset_name: cueadmin-${{ env.BUILD_ID }}-all.tar.gz
310+
asset_path: ${{ github.workspace }}/artifacts/cueadmin-${{ env.BUILD_ID }}-py2.py3-none-any.whl
311+
asset_name: cueadmin-${{ env.BUILD_ID }}-py2.py3-none-any.whl
312+
asset_content_type: application/octet-stream
313+
314+
- name: Upload CueMan package
315+
uses: actions/upload-release-asset@v1
316+
env:
317+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
318+
with:
319+
upload_url: ${{ steps.create_release.outputs.upload_url }}
320+
asset_path: ${{ github.workspace }}/artifacts/cueman-${{ env.BUILD_ID }}-py2.py3-none-any.whl
321+
asset_name: cueman-${{ env.BUILD_ID }}-py2.py3-none-any.whl
312322
asset_content_type: application/octet-stream

0 commit comments

Comments
 (0)