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.

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

caddy: use mainProgram for binary #892

Merged
merged 3 commits into from
Dec 14, 2023
Merged

Conversation

shyim
Copy link
Contributor

@shyim shyim commented Dec 6, 2023

This allows exchanging caddy with a different caddy built binary but different program name. Example frankenphp in nixpkgs

I had to update the devenv.lock as in that commit that mainProgram wasn't added in nixpkgs.

@domenkozar
Copy link
Member

https://www.shellcheck.net/wiki/SC2064 -- Use single quotes, otherwise this...
> https://www.shellcheck.net/wiki/SC3010 -- In POSIX sh, [[ ]] is undefined.
>
> In examples/mailpit/.test.sh line 6:
> trap "pkill -P $DEVENV_PID" EXIT
> ^---------^ SC2064 (warning): Use single quotes, otherwise this expands now rather than when signalled.
>
> For more information:
> https://www.shellcheck.net/wiki/SC2064 -- Use single quotes, otherwise this...
>

@shyim
Copy link
Contributor Author

shyim commented Dec 10, 2023

I fixed the failure in mailpit. I think it was because shellcheck got updated with the lock file change

@domenkozar
Copy link
Member

There's more failures

@shyim
Copy link
Contributor Author

shyim commented Dec 10, 2023

I unified all tests scripts now:

  • fixed all shell checks errors
  • use always trap to stop devenv up
  • use same shebang for all scripts

@domenkozar
Copy link
Member

last 10 log lines:
> https://www.shellcheck.net/wiki/SC1091 -- Not following: /nix/var/nix/profi...
> https://www.shellcheck.net/wiki/SC2181 -- Check exit code directly with e.g...
>
> In build_cloudflare.sh line 1:
> set -xe
> ^-- SC2148 (error): Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.
>
> For more information:
> https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y...
>
For full logs, run 'nix log /nix/store/96b5m76d34iz50bar5hzqn6k467l32a2-pre-commit-run.drv'.

@shyim
Copy link
Contributor Author

shyim commented Dec 12, 2023

So devenv ci now runs without errors

@shyim
Copy link
Contributor Author

shyim commented Dec 12, 2023

Looks the gitignore change of examples broke almost all things. Maybe we can fix that with git config advice.addIgnoredFile false 🤔

@shyim
Copy link
Contributor Author

shyim commented Dec 13, 2023

That flag fixed it. Can you trigger again the pipeline?

@shyim
Copy link
Contributor Author

shyim commented Dec 13, 2023

I had to revert the ignoring of devenv.lock. I think we would need to adjust nix itself? to not run git add on it. 🙈

@shyim
Copy link
Contributor Author

shyim commented Dec 14, 2023

So I fixed clickhouse, vault, modern-c, supported-languages. There is now something failing with ruby and rails. I have there no experience.

But more jobs are green than current main branch 😅

@domenkozar domenkozar merged commit 173466d into cachix:main Dec 14, 2023
115 of 194 checks passed
@domenkozar
Copy link
Member

Thanks for fixing those ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants