Skip to content

Commit b541aa0

Browse files
Merge pull request #25 from ccdc-opensource/DO-1298-upload-proget
DO-1298 upload conquest python to proget
2 parents c5add3a + 56bcdf6 commit b541aa0

File tree

2 files changed

+23
-6
lines changed

2 files changed

+23
-6
lines changed

.github/workflows/build-conquest-python.yml

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ on: # yamllint disable-line rule:truthy
99
default: false
1010
type: boolean
1111
platforms:
12-
description: 'Platform to build for, eg. '
12+
description: "Platform to build for"
13+
type: choice
1314
options:
1415
- 'rocky8'
1516
- 'ubuntu'
@@ -31,7 +32,7 @@ jobs:
3132

3233
steps:
3334
- name: Checkout
34-
uses: actions/checkout@v4
35+
uses: actions/checkout@v5
3536

3637
- name: Set output
3738
id: set_output
@@ -64,13 +65,13 @@ jobs:
6465

6566
steps:
6667
- name: Checkout
67-
uses: actions/checkout@v4
68+
uses: actions/checkout@v5
6869

6970
- name: Set up Python
70-
uses: actions/setup-python@v5
71+
uses: actions/setup-python@v6
7172
if: ${{ needs.setup.outputs.python == 'python' }}
7273
with:
73-
python-version: '3.9'
74+
python-version: '3.11'
7475

7576
- name: Set up Python environment
7677
run: |
@@ -118,3 +119,19 @@ jobs:
118119
jfrog rt upload --flat \
119120
"${{ env.archive_path }}/${{ env.archive_filename }}" \
120121
"ccdc-3rdparty-python-interpreters/conquest_python/2.7/"
122+
123+
- name: Upload conquest python to ProGet
124+
if: ${{ inputs.artifactory-push }}
125+
shell: bash
126+
env:
127+
PROGET_API_KEY: ${{ secrets.PROGET_API_KEY }}
128+
PROGET_BASE_URL: ${{ vars.PROGET_BASE_URL }}
129+
PROGET_ASSET_DIRECTORY: ${{ vars.PROGET_ASSET_DIRECTORY }}
130+
run: |
131+
PROGET_ENDPOINT="${PROGET_BASE_URL}/endpoints/${PROGET_ASSET_DIRECTORY}/content/conquest_python/2.7/${{ env.archive_filename }}"
132+
133+
curl -X POST \
134+
-H "X-ApiKey: ${PROGET_API_KEY}" \
135+
--data-binary "@${{ env.archive_path }}/${{ env.archive_filename }}" \
136+
--fail-with-body \
137+
"$PROGET_ENDPOINT"

build_conquest_python.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ class JpegPackage(InstallInConquestPythonBaseMixin, AutoconfMixin, NoArchiveMixi
512512
@property
513513
def source_archives(self):
514514
return {
515-
f'jpegsrc.v{self.version}.tar.gz': f'https://fossies.org/linux/misc/jpegsrc.v{self.version}.tar.gz'
515+
f'jpegsrc.v{self.version}.tar.gz': f'https://www.ijg.org/files/jpegsrc.v{self.version}.tar.gz'
516516
}
517517

518518

0 commit comments

Comments
 (0)