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

Jump to bottom

Add live ISO to deployed artifacts #124

Merged
merged 1 commit into from
Jul 20, 2023
Merged

Add live ISO to deployed artifacts #124

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
1 change: 1 addition & 0 deletions controller/Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- os: Widen rules for captive portal detection
- os: Split system definition into base and application layers
- os: Make build outputs and displayed system name configurable through application layer
- os: Include live system ISO in deployed outputs

# [2023.2.0] - 2023-03-06

Expand Down
4 changes: 2 additions & 2 deletions deployment/deploy-update/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ substituteAll
, application, updateCert, unsignedRaucBundle, docs, installer
, application, updateCert, unsignedRaucBundle, docs, installer, live
, deployUrl, updateUrl, kioskUrl
, rauc, awscli, python39
}:
substituteAll {
src = ./deploy-update.py;
dummyBuildCert = ../../pki/dummy/cert.pem;
inherit updateCert unsignedRaucBundle docs installer deployUrl updateUrl kioskUrl;
inherit updateCert unsignedRaucBundle docs installer live deployUrl updateUrl kioskUrl;
inherit rauc awscli python39;
inherit (application) fullProductName safeProductName version;
}
8 changes: 8 additions & 0 deletions deployment/deploy-update/deploy-update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

UNSIGNED_RAUC_BUNDLE = "@unsignedRaucBundle@"
INSTALLER_ISO = "@installer@"
LIVE_ISO = "@live@"
DOCS = "@docs@"
VERSION = "@version@"
FULL_PRODUCT_NAME = "@fullProductName@"
Expand Down Expand Up @@ -123,6 +124,13 @@ def _main(opts):
subprocess.run(["cp", installer_iso_src, installer_iso_dst],
check=True)

# Write live system ISO
live_iso_filename = f"{SAFE_PRODUCT_NAME}-live-{VERSION}.iso"
live_iso_src = os.path.join(LIVE_ISO, "iso", live_iso_filename)
live_iso_dst = os.path.join(version_dir, live_iso_filename)
subprocess.run(["cp", live_iso_src, live_iso_dst],
check=True)

# Write PDF manual
manual_filename = f"{SAFE_PRODUCT_NAME}-manual-{VERSION}.pdf"
manual_src = os.path.join(DOCS, "user-manual.pdf")
Expand Down