Skip to content

DO-1298 upload conquest python to proget #25

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

Merged
merged 7 commits into from
Oct 8, 2025
Merged

DO-1298 upload conquest python to proget #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
295fb47
DO-1298 upload conquest python to proget
mmaharjan-ccdc Sep 26, 2025
a636236
DO-1298 get everything from the 4th word onwards for artifact
mmaharjan-ccdc Oct 6, 2025
954e520
DO-1298 use ifj.org for jpeg files
mmaharjan-ccdc Oct 6, 2025
d37683e
DO-1298 revert to easier method
mmaharjan-ccdc Oct 6, 2025
236186e
DO-1298 simplify upload
mmaharjan-ccdc Oct 7, 2025
0671872
DO-1298 add --fail-with-body for better errors
mmaharjan-ccdc Oct 7, 2025
56bcdf6
DO-1298 use python 3.11
mmaharjan-ccdc Oct 7, 2025
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
27 changes: 22 additions & 5 deletions .github/workflows/build-conquest-python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ on: # yamllint disable-line rule:truthy
default: false
type: boolean
platforms:
description: 'Platform to build for, eg. '
description: "Platform to build for"
type: choice
options:
- 'rocky8'
- 'ubuntu'
Expand All @@ -31,7 +32,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set output
id: set_output
Expand Down Expand Up @@ -64,13 +65,13 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
if: ${{ needs.setup.outputs.python == 'python' }}
with:
python-version: '3.9'
python-version: '3.11'

- name: Set up Python environment
run: |
Expand Down Expand Up @@ -118,3 +119,19 @@ jobs:
jfrog rt upload --flat \
"${{ env.archive_path }}/${{ env.archive_filename }}" \
"ccdc-3rdparty-python-interpreters/conquest_python/2.7/"

- name: Upload conquest python to ProGet
if: ${{ inputs.artifactory-push }}
shell: bash
env:
PROGET_API_KEY: ${{ secrets.PROGET_API_KEY }}
PROGET_BASE_URL: ${{ vars.PROGET_BASE_URL }}
PROGET_ASSET_DIRECTORY: ${{ vars.PROGET_ASSET_DIRECTORY }}
run: |
PROGET_ENDPOINT="${PROGET_BASE_URL}/endpoints/${PROGET_ASSET_DIRECTORY}/content/conquest_python/2.7/${{ env.archive_filename }}"

curl -X POST \
-H "X-ApiKey: ${PROGET_API_KEY}" \
--data-binary "@${{ env.archive_path }}/${{ env.archive_filename }}" \
--fail-with-body \
"$PROGET_ENDPOINT"
2 changes: 1 addition & 1 deletion build_conquest_python.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ class JpegPackage(InstallInConquestPythonBaseMixin, AutoconfMixin, NoArchiveMixi
@property
def source_archives(self):
return {
f'jpegsrc.v{self.version}.tar.gz': f'https://fossies.org/linux/misc/jpegsrc.v{self.version}.tar.gz'
f'jpegsrc.v{self.version}.tar.gz': f'https://www.ijg.org/files/jpegsrc.v{self.version}.tar.gz'
}


Expand Down