Skip to content
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

build-driver: update URL to latest release dpkg.list #244

Merged
merged 1 commit into from
Dec 19, 2024
Merged

build-driver: update URL to latest release dpkg.list #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 deletions build-driver/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,16 +330,12 @@ def install_debian_dependencies():
)


def download_old_dpkg_list_last_release(tmp_dir: Path, last_release_version: str | None, flavor: str) -> Path | None:
def download_old_dpkg_list_last_release(tmp_dir: Path, last_release_version: str | None, flavor: str, arch: str) -> Path | None:
if last_release_version is None:
return None

# TODO:
# 1) deal with (OLD!) release names
# 2) interpolate arch, etc
# 3) error handling?
path = tmp_dir / "dpkg.list.previous_release"
url = f"https://grml.org/files/grml64-{flavor}_{last_release_version}/dpkg.list"
url = f"https://ftp-master.grml.org/grml-{last_release_version}-metadata/grml-full-{last_release_version}-{arch}/dpkg.list"
with ci_section(f"Downloading old dpkg.list {url} to {path!s}"):
try:
download_file(url, path)
Expand Down Expand Up @@ -496,7 +492,7 @@ def main(program_name: str, argv: list[str]) -> int:
install_debian_dependencies()

old_dpkg_list_previous_build = cache_dir / "dpkg.list"
old_dpkg_list_last_release = download_old_dpkg_list_last_release(tmp_dir, last_release_version, flavor)
old_dpkg_list_last_release = download_old_dpkg_list_last_release(tmp_dir, last_release_version, flavor, arch)
if old_iso_url is None:
old_iso_path = None
else:
Expand Down
6 changes: 3 additions & 3 deletions test/gha-build-iso.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ EOT

cat >build-gha-ci-test-config-initial <<EOT
---
last_release: "2024.02"
last_release: "2024.12"
EOT

run_build() {
Expand Down Expand Up @@ -53,7 +53,7 @@ elif [ "$MODE" = "build-only-twice" ]; then
INPUT_ISO=$(ls results-initial/grml_isos/grml*iso)
cat >build-gha-ci-test-config-build-only-first <<EOT
---
last_release: "2024.02"
last_release: "2024.12"
debian_suite: testing
release_version: "ci-bo-first"
release_name: CI1
Expand All @@ -67,7 +67,7 @@ EOT
INPUT_ISO=$(ls results-build-only-first/grml_isos/grml*iso)
cat >build-gha-ci-test-config-build-only-second <<EOT
---
last_release: "2024.02"
last_release: "2024.12"
debian_suite: testing
release_version: "ci-bo-second"
release_name: CI2
Expand Down
Loading