Compare commits

...

3 Commits

Author SHA1 Message Date
0fded0170a feat(storage-server): fix service
All checks were successful
arcad/edge/pipeline/head This commit looks good
2023-10-02 20:56:53 -06:00
6ddd831025 fix(ci): update sdk test app version correctly
All checks were successful
arcad/edge/pipeline/head This commit looks good
2023-10-02 16:11:46 -06:00
4fe68e335a fix(ci): add missing task dependency
Some checks failed
arcad/edge/pipeline/head There was a failure building this commit
2023-10-02 15:18:23 -06:00
4 changed files with 7 additions and 6 deletions

1
Jenkinsfile vendored
View File

@ -34,6 +34,7 @@ pipeline {
passwordVariable: 'GITEA_RELEASE_PASSWORD' passwordVariable: 'GITEA_RELEASE_PASSWORD'
]) ])
]) { ]) {
sh 'make .mktools'
sh 'make gitea-release' sh 'make gitea-release'
} }
} }

View File

@ -83,7 +83,7 @@ run-storage-server: .env
.env: .env:
cp .env.dist .env cp .env.dist .env
gitea-release: tools/yq/bin/yq tools/gitea-release/bin/gitea-release.sh goreleaser build gitea-release: .mktools tools/yq/bin/yq tools/gitea-release/bin/gitea-release.sh goreleaser build
mkdir -p .gitea-release mkdir -p .gitea-release
rm -rf .gitea-release/* rm -rf .gitea-release/*
@ -123,12 +123,12 @@ tools/modd/bin/modd:
GOBIN=$(PWD)/tools/modd/bin go install -mod=readonly github.com/cortesi/modd/cmd/modd@latest GOBIN=$(PWD)/tools/modd/bin go install -mod=readonly github.com/cortesi/modd/cmd/modd@latest
.PHONY: goreleaser .PHONY: goreleaser
goreleaser: .mktools changelog goreleaser: .env .mktools changelog
( set -o allexport && source .env && set +o allexport && curl -sfL https://goreleaser.com/static/run | VERSION="$(GORELEASER_VERSION)" GORELEASER_CURRENT_TAG="$(MKT_PROJECT_VERSION)" bash /dev/stdin $(GORELEASER_ARGS) ) ( set -o allexport && source .env && set +o allexport && curl -sfL https://goreleaser.com/static/run | VERSION="$(GORELEASER_VERSION)" GORELEASER_CURRENT_TAG="$$MKT_PROJECT_VERSION" bash /dev/stdin $(GORELEASER_ARGS) )
.PHONY: changelog .PHONY: changelog
changelog: .mktools changelog: .mktools
$(MAKE) MKT_GIT_CHGLOG_ARGS='--next-tag $$(MKT_PROJECT_VERSION) --tag-filter-pattern $$(MKT_PROJECT_VERSION_CHANNEL) --output CHANGELOG.md' mkt-changelog $(MAKE) MKT_GIT_CHGLOG_ARGS='--next-tag "$(MKT_PROJECT_VERSION)" --tag-filter-pattern "$(MKT_PROJECT_VERSION_CHANNEL)" --output CHANGELOG.md' mkt-changelog
.PHONY: mktools .PHONY: mktools
mktools: mktools:

View File

@ -1,7 +1,7 @@
#!/sbin/openrc-run #!/sbin/openrc-run
command="/usr/bin/storage-server" command="/usr/bin/storage-server"
command_args="" command_args=run""
supervisor=supervise-daemon supervisor=supervise-daemon
output_log="/var/log/storage-server.log" output_log="/var/log/storage-server.log"
error_log="$output_log" error_log="$output_log"

View File

@ -6,7 +6,7 @@ After=network.target
Type=simple Type=simple
Restart=on-failure Restart=on-failure
EnvironmentFile=/etc/storage-server/environ EnvironmentFile=/etc/storage-server/environ
ExecStart=/usr/bin/storage-server ExecStart=/usr/bin/storage-server run
EnvironmentFile=/etc/storage-server/environ EnvironmentFile=/etc/storage-server/environ
NoNewPrivileges=yes NoNewPrivileges=yes
PrivateTmp=yes PrivateTmp=yes