-
-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
woodpecker-{agent,cli,server}: init at 0.15.3 #178441
Conversation
e850213
to
1cdaee4
Compare
Do you plan to add a module? |
I plan on migrating my own configuration from Drone to Woodpecker, if nothing breaks in that process. I don't think I'll be adding a module (in this MR at least), mostly because one might want to have multiple instances of the agent running at once on the same machine (which is not supported very well by the module system), e.g: a |
Not sure why ofborg is unhappy about (what seems to be) the |
it's because yarn2nix is reading the package json into eval, so it's a build output -> eval aka IFD you'll want to copy the package json over into the repo. or I can see about removing the IFD issues |
@06kellyjac I would rather not copy the My wondering is more along the lines of why other packages that make use of |
they all just copy in package.json, its a simple wget or curl in the update script. Again I'll see if I can tweak yarn2nix to stop the IFD issues when I get some time I made some changes e243a8c
server started and ui shows fine but that's all I did:
|
@06kellyjac I think we should only keep the front-end as a self: super:
{
woodpecker-server = super.woodpecker-server.override {
woodpecker-frontend = super.woodpecker-server.passthru.woodpecker-frontend.override {
# Override here
};
};
} |
0109b89
to
699dff0
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not super familiar with passthru but yeah since it's an input to server you could replace it with anything, in this case an overriden frontend grabbed from passthru
so yeah that looks fine
As for the remaining eval/IFD issues I think it's because you need to set offlineCache or it just does it magically with IFD stuff
pkgs/development/tools/continuous-integration/woodpecker/frontend.nix
Outdated
Show resolved
Hide resolved
pkgs/development/tools/continuous-integration/woodpecker/frontend.nix
Outdated
Show resolved
Hide resolved
pkgs/development/tools/continuous-integration/woodpecker/agent.nix
Outdated
Show resolved
Hide resolved
Pushed some fixups (which will need to be rebased/squashed). |
pkgs/development/tools/continuous-integration/woodpecker/common.nix
Outdated
Show resolved
Hide resolved
fb23126
to
7f71e94
Compare
d2b18d8
to
f809aac
Compare
f809aac
to
c3509c7
Compare
Result of 3 packages built:
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
pkgs/development/tools/continuous-integration/woodpecker/update.sh
Outdated
Show resolved
Hide resolved
pkgs/development/tools/continuous-integration/woodpecker/update.sh
Outdated
Show resolved
Hide resolved
pkgs/development/tools/continuous-integration/woodpecker/server.nix
Outdated
Show resolved
Hide resolved
pkgs/development/tools/continuous-integration/woodpecker/frontend.nix
Outdated
Show resolved
Hide resolved
* Use 'callPackage' to import 'common.nix'. * Prefix the binaries with 'woodpecker-', removing the need for 'meta.mainProgram'. * Remove IFD in 'mkYarnPackage' by committing 'package.json'. * Simplify the server derivation, by not building it statically. * Expose 'woodpecker-frontend' as a package for overriding purposes. * Reduce package size for 'woodpecker-frontend' by just keeping the 'dist' folder. * Have common `ldflags` and `postBuild` values.
c3509c7
to
b03ea1d
Compare
Description of changes
Supersedes #169470.
Closes #178332.
Some notes :
woodpecker-
, instead of justcli
,agent
, andserver
.musl
.Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes