Skip to content

Commit 954e520

Browse files
DO-1298 use ifj.org for jpeg files
1 parent a636236 commit 954e520

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,18 @@ jobs:
9090
9191
- name: Build conquest python
9292
run: |
93-
output=$(${{ needs.setup.outputs.python }} build_conquest_python.py | grep Creating | tail -n 1)
93+
${{ needs.setup.outputs.python }} build_conquest_python.py > build_output.log 2>&1
94+
cat build_output.log
95+
output=$(grep "Creating.*\.tar\.gz.*in" build_output.log | tail -n 1)
96+
echo "Parsed output line: $output"
97+
if [[ -z "$output" ]]; then
98+
echo "Error: No 'Creating' line found in build output"
99+
exit 1
100+
fi
94101
archive_filename=$(echo $output | awk '{print $2}')
95-
archive_path=$(echo $output | awk '{for(i=4;i<=NF;i++) printf "%s%s", $i, (i<NF ? " " : "")}')
102+
archive_path=$(echo $output | sed 's/^Creating .* in //')
103+
echo "Parsed filename: $archive_filename"
104+
echo "Parsed path: $archive_path"
96105
echo "archive_filename=$archive_filename" >> $GITHUB_ENV
97106
echo "archive_path=$archive_path" >> $GITHUB_ENV
98107

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)