Repository navigation
chore(fleet): pin nixos-holochain to main after the lab merge - #68
Merged
Merged
Conversation
3 of 4 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No issue: first follow-up of #67 (listed in #67 (comment)).
What and why
The example fleet read
nixos-holochainfromlab/holoport-sessionbecausemaindid not carry the event profile and the Moss node. #67 merged that branch intomain(merge commit 666c5ae), so the fleet goes back tomain:examples/sensorica-fleet/flake.nix:nixos-holochain.url = "github:Sensorica/nixos-holochain", with the comment saying it ismain, as a downstream fleet writes it.examples/sensorica-fleet/flake.lock:nix flake update nixos-holochainmoved only that node, from 4b1b722 on the lab branch to 666c5ae onmain. No other input changed.examples/sensorica-fleet/README.md(also the book's "The Sensorica Lab fleet" page): the Holoports install frommain, and a Holoport installed from the lab branch switches its/etc/nixos-holochaincheckout once, keeping its local operator key commit:checkout -B mainnames the current commit (key included)main;rebase origin/mainreplays only the operator key commit, sinceorigin/lab/holoport-sessionis an ancestor oforigin/main. After that, the existinggit -C /etc/nixos-holochain pull --rebasefollowsmain.docs/deployment.mdalready clones the default branch, which ismain, so it needed no change. No other file names the lab branch.Commands run and what they printed
The switch commands were run against a scratch clone set up like a lab Holoport:
lab/holoport-sessionat c9d2485 with an operator key committed on top. Afterwardsgit status -sbprinted## main...origin/main [ahead 1],git log --oneline origin/main..mainprinted only the operator key commit, and the key was still inhosts/common.nix. They were not run on a real Holoport.VM tests built
Only files under
examples/changed. The root flake'schecks.x86_64-linuxdrvPaths are identical tomainat 666c5ae for all 28 checks exceptmoss-dashboard, which reads the source tree and was built locally (passed).All 14 VM tests were built locally on KVM in one
nix build --keep-going(exit 0, 14vm-test-run-*outputs),vmTestGrafanaincluded with no retry:vmTest: passedvmTest-0_6: passedvmTestBootstrap: passedvmTestConductorMetrics-0_6: passedvmTestGateway: passedvmTestGrafana: passedvmTestHoloportInstall: passedvmTestMossNode: passedvmTestServices: passedvmTestServices-noBootstrap: passedvmTestWdocker: passedvmTestWindtunnel: passedvmTestWithHapp: passedvmTestWithHapp-0_6: passedOption reference
docs/module-options.mdwas regenerated withcp "$(nix build .#options-doc --print-out-paths)" docs/module-options.mdin the same commit.Documentation
docs/(andREADME.md, if it says anything about this) updated in this PR, or nothing there describes the changed behaviour.