Updatd config files; ran formatter

cron
Jef Roosens 2022-04-06 16:57:27 +02:00
parent 5b919ceeae
commit b90e6cf6b4
Signed by untrusted user: Jef Roosens
GPG Key ID: B75D4F293C7052DB
9 changed files with 13 additions and 68 deletions

View File

@ -36,22 +36,6 @@ pipeline:
when: when:
event: push event: push
cli:
image: 'chewingbever/vlang:latest'
environment:
- LDFLAGS=-static
commands:
- make cli-prod
# Make sure the binary is actually statically built
- readelf -d vieterctl
- du -h vieterctl
- '[ "$(readelf -d vieterctl | grep NEEDED | wc -l)" = 0 ]'
# This removes so much, it's amazing
- strip -s vieterctl
- du -h vieterctl
when:
event: push
upload: upload:
image: 'chewingbever/vlang:latest' image: 'chewingbever/vlang:latest'
secrets: [ s3_username, s3_password ] secrets: [ s3_username, s3_password ]
@ -74,20 +58,5 @@ pipeline:
-H "Content-Type: $CONTENT_TYPE" -H "Content-Type: $CONTENT_TYPE"
-H "Authorization: AWS $S3_USERNAME:$SIGNATURE" -H "Authorization: AWS $S3_USERNAME:$SIGNATURE"
https://$URL$OBJ_PATH https://$URL$OBJ_PATH
# Also update the CLI tool
- export OBJ_PATH="/vieter/commits/$CI_COMMIT_SHA/vieterctl-$(echo '${PLATFORM}' | sed 's:/:-:g')"
- export SIG_STRING="PUT\n\n$CONTENT_TYPE\n$DATE\n$OBJ_PATH"
- export SIGNATURE=`echo -en $SIG_STRING | openssl sha1 -hmac $S3_PASSWORD -binary | base64`
- >
curl
--silent
-XPUT
-T vieterctl
-H "Host: $URL"
-H "Date: $DATE"
-H "Content-Type: $CONTENT_TYPE"
-H "Authorization: AWS $S3_USERNAME:$SIGNATURE"
https://$URL$OBJ_PATH
when: when:
event: push event: push

View File

@ -42,18 +42,6 @@ pvieter: $(SOURCES)
c: c:
$(V) -o vieter.c $(SRC_DIR) $(V) -o vieter.c $(SRC_DIR)
# Build the CLI tool
.PHONY: cli
cli: dvieterctl
dvieterctl: cli.v
$(V_PATH) -showcc -g -o dvieterctl cli.v
.PHONY: cli-prod
cli-prod: vieterctl
vieterctl: cli.v
cli-prod:
$(V_PATH) -showcc -o vieterctl -prod cli.v
# =====EXECUTION===== # =====EXECUTION=====
# Run the server in the default 'data' directory # Run the server in the default 'data' directory
.PHONY: run .PHONY: run

View File

@ -1,7 +1,7 @@
# Maintainer: Jef Roosens # Maintainer: Jef Roosens
pkgbase='vieter' pkgbase='vieter'
pkgname=('vieter' 'vieterctl') pkgname='vieter'
pkgver=0.1.0.rc1.r45.g6d3ff8a pkgver=0.1.0.rc1.r45.g6d3ff8a
pkgrel=1 pkgrel=1
depends=('glibc' 'openssl' 'libarchive' 'gc') depends=('glibc' 'openssl' 'libarchive' 'gc')
@ -23,21 +23,12 @@ build() {
# Build the compiler # Build the compiler
CFLAGS= make v CFLAGS= make v
# Build the server & the CLI tool
make prod make prod
make cli-prod
} }
package_vieter() { package() {
pkgdesc="Vieter is a lightweight implementation of an Arch repository server." pkgdesc="Vieter is a lightweight implementation of an Arch repository server."
install -dm755 "$pkgdir/usr/bin" install -dm755 "$pkgdir/usr/bin"
install -Dm755 "$pkgbase/pvieter" "$pkgdir/usr/bin/vieter" install -Dm755 "$pkgbase/pvieter" "$pkgdir/usr/bin/vieter"
} }
package_vieterctl() {
pkgdesc="Allows you to configure a Vieter server's list of Git repositories."
install -dm755 "$pkgdir/usr/bin"
install -Dm755 "$pkgbase/vieterctl" "$pkgdir/usr/bin/vieterctl"
}

View File

@ -14,4 +14,3 @@ pub fn cmd() cli.Command {
} }
} }
} }

View File

@ -91,5 +91,4 @@ pub fn load<T>() ?T {
} }
pub fn load_with_file<T>(path string) ?T { pub fn load_with_file<T>(path string) ?T {
} }

View File

@ -14,15 +14,15 @@ pub fn cmd() cli.Command {
name: 'repos' name: 'repos'
description: 'Interact with the repos API.' description: 'Interact with the repos API.'
commands: [ commands: [
cli.Command{ cli.Command{
name: 'list' name: 'list'
description: 'List the current repos.' description: 'List the current repos.'
execute: fn (cmd cli.Command) ? { execute: fn (cmd cli.Command) ? {
conf := env.load<Config>() ? conf := env.load<Config>() ?
list(conf) ? list(conf) ?
} }
} },
] ]
} }
} }

View File

@ -37,4 +37,3 @@ pub fn write_repos(path string, repos []GitRepo) ? {
value := json.encode(repos) value := json.encode(repos)
f.write_string(value) ? f.write_string(value) ?
} }

View File

@ -21,12 +21,12 @@ fn main() {
description: 'Location of Vieter config file; defaults to ~/.vieterrc.' description: 'Location of Vieter config file; defaults to ~/.vieterrc.'
global: true global: true
default_value: [os.expand_tilde_to_home('~/.vieterrc')] default_value: [os.expand_tilde_to_home('~/.vieterrc')]
} },
] ]
commands: [ commands: [
server.cmd(), server.cmd(),
build.cmd(), build.cmd(),
git.cmd() git.cmd(),
] ]
} }

View File

@ -10,7 +10,7 @@ pub fn cmd() cli.Command {
execute: fn (cmd cli.Command) ? { execute: fn (cmd cli.Command) ? {
conf := env.load<env.ServerConfig>() ? conf := env.load<env.ServerConfig>() ?
server.server(conf) ? server(conf) ?
} }
} }
} }