LordMZTE
/
vieter
forked from vieter-v/vieter
1
0
Fork 0
Code Issues Pull Requests Releases Activity

chore: ran `make fmt`

dev
Jef Roosens 2022-05-08 14:53:35 +02:00
parent 4b172cb5d8
commit e79d18100f
Signed by untrusted user: Jef Roosens
GPG Key ID: B75D4F293C7052DB
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/build/build.v
View File

@ -75,9 +75,9 @@ pub fn create_build_image(base_image string) ?string {
struct BuildResult { struct BuildResult {
start_time time.Time start_time time.Time
end_time time.Time end_time time.Time
exit_code int exit_code int
logs string logs string
} }
// build_repo builds, packages & publishes a given Arch package based on the // build_repo builds, packages & publishes a given Arch package based on the
@ -94,7 +94,7 @@ pub fn build_repo(address string, api_key string, base_image_id string, repo &db
'source PKGBUILD', 'source PKGBUILD',
// The build container checks whether the package is already // The build container checks whether the package is already
// present on the server // present on the server
'curl --head --fail $address/$repo.repo/$build_arch/\$pkgname-\$pkgver-\$pkgrel && exit 0', 'curl -s --head --fail $address/$repo.repo/$build_arch/\$pkgname-\$pkgver-\$pkgrel && exit 0',
'MAKEFLAGS="-j\$(nproc)" makepkg -s --noconfirm --needed && for pkg in \$(ls -1 *.pkg*); do curl -XPOST -T "\$pkg" -H "X-API-KEY: \$API_KEY" $address/$repo.repo/publish; done', 'MAKEFLAGS="-j\$(nproc)" makepkg -s --noconfirm --needed && for pkg in \$(ls -1 *.pkg*); do curl -XPOST -T "\$pkg" -H "X-API-KEY: \$API_KEY" $address/$repo.repo/publish; done',
] ]
@ -146,18 +146,16 @@ fn build(conf Config, repo_id int) ? {
build_arch := os.uname().machine build_arch := os.uname().machine
// First, we create a base image which has updated repos n stuff
println('Creating base image...') println('Creating base image...')
image_id := create_build_image(conf.base_image) ? image_id := create_build_image(conf.base_image) ?
println('Running build...') println('Running build...')
res := build_repo(conf.address, conf.api_key, image_id, repo) ? res := build_repo(conf.address, conf.api_key, image_id, repo) ?
// Remove the builder image
println('Removing build image...') println('Removing build image...')
docker.remove_image(image_id) ? docker.remove_image(image_id) ?
// Upload the build log to the Vieter instance
println('Uploading logs to Vieter...') println('Uploading logs to Vieter...')
c.add_build_log(repo.id, res.start_time, res.end_time, build_arch, res.exit_code, res.logs) ? c.add_build_log(repo.id, res.start_time, res.end_time, build_arch, res.exit_code,
res.logs) ?
} }

12
src/docker/containers.v
View File

@ -57,15 +57,15 @@ pub mut:
struct ContainerState { struct ContainerState {
pub: pub:
running bool [json: Running] running bool [json: Running]
status string [json: Status] status string [json: Status]
exit_code int [json: ExitCode] exit_code int [json: ExitCode]
// These use a rather specific format so they have to be parsed later // These use a rather specific format so they have to be parsed later
start_time_str string [json: StartedAt] start_time_str string [json: StartedAt]
end_time_str string [json: FinishedAt] end_time_str string [json: FinishedAt]
pub mut: pub mut:
start_time time.Time [skip] start_time time.Time [skip]
end_time time.Time [skip] end_time time.Time [skip]
} }
fn docker_timestamp_to_time(s string) ?time.Time { fn docker_timestamp_to_time(s string) ?time.Time {
@ -88,7 +88,7 @@ pub fn inspect_container(id string) ?ContainerInspect {
data.state.start_time = docker_timestamp_to_time(data.state.start_time_str) ? data.state.start_time = docker_timestamp_to_time(data.state.start_time_str) ?
if data.state.status == "exited" { if data.state.status == 'exited' {
data.state.end_time = docker_timestamp_to_time(data.state.end_time_str) ? data.state.end_time = docker_timestamp_to_time(data.state.end_time_str) ?
} }