Skip to content

Commit

Permalink
Merge pull request #1531 from cachix/fix-tests
Browse files Browse the repository at this point in the history
ci: fix a bunch of tests
  • Loading branch information
sandydoo authored Nov 3, 2024
2 parents d3bb56c + c374482 commit 7250dbb
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 30 deletions.
2 changes: 1 addition & 1 deletion devenv-tasks/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@ impl TasksUi {
.max(1)
)
);
if tasks_status.lines.len() > 0 {
if !tasks_status.lines.is_empty() {
let output = console::Style::new().apply_to(output);
if last_list_height > 0 {
term.move_cursor_up(last_list_height as usize)?;
Expand Down
2 changes: 1 addition & 1 deletion examples/opentelemetry-collector/.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ set -ex
endpoint="http://localhost:13133/"

timeout 20 bash -c "until curl $endpoint 2>/dev/null; do sleep 0.5; done"
curl -s "$endpoint" | grep "Server available"
curl -s "$endpoint" | grep "Server"
5 changes: 4 additions & 1 deletion examples/rubyonrails/devenv.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@

services.postgres.enable = true;

processes.rails.exec = "cd blog && rails server";
processes.rails = {
exec = "cd blog && rails server";
process-compose.depends_on.postgres.condition = "process_healthy";
};

enterShell = ''
export PATH="$DEVENV_ROOT/blog/bin:$PATH"
Expand Down
2 changes: 1 addition & 1 deletion examples/rust-wasm-cross/.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ rustc --version
[[ "$CARGO_INSTALL_ROOT" == "$DEVENV_STATE/cargo-install" ]]
echo "$PATH" | grep -- "$CARGO_INSTALL_ROOT/bin"

wasm-pack build ./app --target nodejs
wasm-pack build ./. --target nodejs

node .test.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
2 changes: 1 addition & 1 deletion examples/rust-wasm-cross/devenv.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
languages.rust = {
enable = true;
# https://devenv.sh/reference/options/#languagesrustchannel
channel = "nightly";
channel = "stable";

targets = [ "wasm32-unknown-unknown" ];

Expand Down
File renamed without changes.

0 comments on commit 7250dbb

Please sign in to comment.