From f9a4699e84bfe5bb5db5f38a4dce27604f4c12ae Mon Sep 17 00:00:00 2001 From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> Date: Tue, 29 Nov 2022 04:49:43 -0700 Subject: [PATCH] check environment (#1990) * check environment * fix tests * don't rebuild sources * I'm going insane * WTF * Update check-environment.sh * Update product.yaml * Update write-image.sh --- .github/workflows/product.yaml | 7 +++---- Makefile | 6 ------ backend/src/bin/embassy-init.rs | 2 +- backend/src/lib.rs | 2 +- backend/src/version/v0_3_3.rs | 6 ++---- build/raspberry-pi/write-image.sh | 2 +- check-environment.sh | 3 ++- 7 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.github/workflows/product.yaml b/.github/workflows/product.yaml index 23e704e86..5d3df479e 100644 --- a/.github/workflows/product.yaml +++ b/.github/workflows/product.yaml @@ -120,9 +120,9 @@ jobs: run: | tar -mxvf frontend.tar frontend/config.json tar -mxvf frontend.tar frontend/dist - tar -mxvf frontend.tar GIT_HASH.txt - tar -mxvf frontend.tar ENVIRONMENT.txt - tar -mxvf frontend.tar VERSION.txt + tar -xvf frontend.tar GIT_HASH.txt + tar -xvf frontend.tar ENVIRONMENT.txt + tar -xvf frontend.tar VERSION.txt rm frontend.tar - name: Cache raspiOS @@ -134,7 +134,6 @@ jobs: - name: Build image run: | - touch -d "1970-01-01T00:00:00Z" ENVIRONMENT.txt GIT_HASH.txt VERSION.txt make V=1 embassyos-raspi.img --debug - uses: actions/upload-artifact@v3 diff --git a/Makefile b/Makefile index e6817a6d2..213e1ac24 100644 --- a/Makefile +++ b/Makefile @@ -116,12 +116,6 @@ raspios.img: unzip 2022-01-28-raspios-bullseye-arm64-lite.zip mv 2022-01-28-raspios-bullseye-arm64-lite.img raspios.img -product_key.txt: - $(shell which echo) -n "X" > product_key.txt - cat /dev/urandom | base32 | head -c11 | tr '[:upper:]' '[:lower:]' >> product_key.txt - if [ "$(KEY)" != "" ]; then $(shell which echo) -n "$(KEY)" > product_key.txt; fi - echo >> product_key.txt - snapshots: libs/snapshot_creator/Cargo.toml cd libs/ && ./build-v8-snapshot.sh cd libs/ && ./build-arm-v8-snapshot.sh diff --git a/backend/src/bin/embassy-init.rs b/backend/src/bin/embassy-init.rs index 3b83f2b33..413e4a1b2 100644 --- a/backend/src/bin/embassy-init.rs +++ b/backend/src/bin/embassy-init.rs @@ -32,7 +32,7 @@ async fn setup_or_init(cfg_path: Option) -> Result<(), Error> { let ctx = InstallContext::init(cfg_path).await?; let embassy_ip_fqdn: ResourceFqdn = ResourceFqdn::IpAddr; - let embassy_fqdn: ResourceFqdn = "pureos.local".parse()?; + let embassy_fqdn: ResourceFqdn = "embassy.local".parse()?; let localhost_fqdn = ResourceFqdn::LocalHost; diff --git a/backend/src/lib.rs b/backend/src/lib.rs index e4e8cbfbe..576f93a3d 100644 --- a/backend/src/lib.rs +++ b/backend/src/lib.rs @@ -1,7 +1,7 @@ #![recursion_limit = "256"] pub const DEFAULT_MARKETPLACE: &str = "https://registry.start9.com"; -pub const COMMUNITY_MARKETPLACE: &str = "https://community-registry.start9.com"; +// pub const COMMUNITY_MARKETPLACE: &str = "https://community-registry.start9.com"; pub const BUFFER_SIZE: usize = 1024; pub const HOST_IP: [u8; 4] = [172, 18, 0, 1]; pub const TARGET: &str = current_platform::CURRENT_PLATFORM; diff --git a/backend/src/version/v0_3_3.rs b/backend/src/version/v0_3_3.rs index 462159c1b..6bdc767f1 100644 --- a/backend/src/version/v0_3_3.rs +++ b/backend/src/version/v0_3_3.rs @@ -4,7 +4,7 @@ use serde_json::{json, Value}; use super::v0_3_0::V0_3_0_COMPAT; use super::*; -use crate::{COMMUNITY_MARKETPLACE, DEFAULT_MARKETPLACE}; +use crate::DEFAULT_MARKETPLACE; const V0_3_3: emver::Version = emver::Version::new(0, 3, 3, 0); @@ -104,14 +104,12 @@ impl VersionT for Version { #[derive(Debug, Clone, Copy)] pub enum MarketPlaceUrls { Default, - Community, } impl MarketPlaceUrls { pub fn url(&self) -> String { let url_string = match self { MarketPlaceUrls::Default => DEFAULT_MARKETPLACE, - MarketPlaceUrls::Community => COMMUNITY_MARKETPLACE, }; format!("{url_string}/") } @@ -121,7 +119,7 @@ impl MarketPlaceUrls { fn test_that_ui_includes_url() { let ui: Value = serde_json::from_str(include_str!("../../../frontend/patchdb-ui-seed.json")).unwrap(); - for market_place in [MarketPlaceUrls::Default, MarketPlaceUrls::Community] { + for market_place in [MarketPlaceUrls::Default] { let url = market_place.url(); assert!( !ui["marketplace"]["known-hosts"][&url].is_null(), diff --git a/build/raspberry-pi/write-image.sh b/build/raspberry-pi/write-image.sh index 58f8f5b7d..761f217f0 100755 --- a/build/raspberry-pi/write-image.sh +++ b/build/raspberry-pi/write-image.sh @@ -25,7 +25,7 @@ sudo umount $TMPDIR sudo mount `partition_for ${OUTPUT_DEVICE} 2` $TMPDIR sudo mkdir $TMPDIR/media/embassy/ -sudo make V=1 install ARCH=aarch64 OS_ARCH=raspberrypi DESTDIR=$TMPDIR --debug +sudo ENVIRONMENT=$ENVIRONMENT make V=1 install ARCH=aarch64 OS_ARCH=raspberrypi DESTDIR=$TMPDIR --debug sudo sed -i 's/raspberrypi/embassy/g' $TMPDIR/etc/hostname sudo sed -i 's/raspberrypi/embassy/g' $TMPDIR/etc/hosts sudo cp cargo-deps/aarch64-unknown-linux-gnu/release/nc-broadcast $TMPDIR/usr/local/bin diff --git a/check-environment.sh b/check-environment.sh index 9cf7e8ee3..0871b39fb 100755 --- a/check-environment.sh +++ b/check-environment.sh @@ -1,7 +1,8 @@ #!/bin/bash if ! [ -f ./ENVIRONMENT.txt ] || [ "$(cat ./ENVIRONMENT.txt)" != "$ENVIRONMENT" ]; then + >&2 echo "Updating ENVIRONMENT.txt to $ENVIRONMENT" echo -n "$ENVIRONMENT" > ./ENVIRONMENT.txt fi -echo -n ./ENVIRONMENT.txt \ No newline at end of file +echo -n ./ENVIRONMENT.txt