Phil/goshorly
1
0
Fork 0
Code Issues 2 Pull requests 2 Releases 4 Packages 1 Activity

[CI Workflow] Improvments for next releses and logic #11

Merged
Phil merged 13 commits from phil-patch-2 into main 2025-04-07 17:41:42 +00:00
Conversation 0 Commits 13 Files changed 12 +71 -79
7 changed files with 71 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d1295c10bc - Show all commits

17
.woodpecker/10-build-main.yml
View file

@ -1,15 +1,21 @@
steps:
- name: build-binary
- name: build-binary/linux-amd64
image: golang:1.24.2
environment:
I_PACKAGE: "git.hackmi.ch/Phil/goshorly/utils"
CGO_ENABLED: 0
commands:
- export CI_COMMIT_SHORT_SHA=${CI_COMMIT_SHA:0:10}
- go build -ldflags="-X main.CommitSHA=${CI_COMMIT_SHORT_SHA}" -o linux-amd64 .
- export CI_COMMIT_SHA=${CI_COMMIT_SHA}
- go build -a -installsuffix cgo -ldflags=" -X $I_PACKAGE.CI_COMMIT_SHA=$CI_COMMIT_SHA -X $I_PACKAGE.CI_COMMIT_BRANCH=$CI_COMMIT_BRANCH -X $I_PACKAGE.CI_COMMIT_TAG=$CI_COMMIT_TAG" -o app .
when:
- event: [push, cron]
branch: main
- name: build-and-push-docker-dev
image: woodpeckerci/plugin-docker-buildx:5.2.2
environment:
I_PACKAGE: "git.hackmi.ch/Phil/goshorly/utils"
CGO_ENABLED: 0
settings:
platforms: linux/amd64,linux/arm/v6,linux/arm64/v8
repo: git.hackmi.ch/phil/goshorly
@ -19,11 +25,8 @@ steps:
from_secret: reg-user
password:
from_secret: reg-pass
build_args:
- CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}
- CI_COMMIT_SHORT_SHA=${CI_COMMIT_SHA:0:10}
depends_on:
- build-binary
- build-binary/linux-amd64
when:
- event: [push, cron]
branch: main

15
Dockerfile
View file

@ -1,24 +1,13 @@
FROM golang:alpine as builder
FROM golang:1.24.2-alpine as builder
RUN apk add --no-cache git make build-base
ARG CI_COMMIT_BRANCH
ARG CI_COMMIT_SHORT_SHA
ARG CI_COMMIT_TAG
ENV CI_COMMIT_BRANCH=$CI_COMMIT_BRANCH
ENV CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA
ENV CI_COMMIT_TAG=$CI_COMMIT_TAG
ENV I_PACKAGE="git.hackmi.ch/Phil/goshorly/utils"
ENV CGO_ENABLED=0
WORKDIR /go/src/git.hackmi.ch/goshorly
COPY . .
RUN go get -d -v ./...
RUN go build -a -installsuffix cgo -ldflags=" -X $I_PACKAGE.CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA -X $I_PACKAGE.CI_COMMIT_BRANCH=$CI_COMMIT_BRANCH -X $I_PACKAGE.CI_COMMIT_TAG=$CI_COMMIT_TAG" -o app .
RUN go build -a -installsuffix cgo -ldflags=" -X $I_PACKAGE.CI_COMMIT_SHA=$CI_COMMIT_SHA -X $I_PACKAGE.CI_COMMIT_BRANCH=$CI_COMMIT_BRANCH -X $I_PACKAGE.CI_COMMIT_TAG=$CI_COMMIT_TAG" -o app .
FROM scratch as production
WORKDIR /

2
routes/gethome.go
View file

@ -8,7 +8,7 @@ import (
func Gethome(c *fiber.Ctx) error {
return c.Render("views/home", fiber.Map{
"CI_COMMIT_SHORT_SHA": utils.CI_COMMIT_SHORT_SHA,
"CI_COMMIT_SHA": utils.CI_COMMIT_SHA,
"CI_COMMIT_BRANCH": utils.CI_COMMIT_BRANCH,
"CI_COMMIT_TAG": utils.CI_COMMIT_TAG,
"CI_TAGGED": utils.CI_TAGGED,

10
routes/posthome.go
View file

@ -29,7 +29,7 @@ func Posthome(c *fiber.Ctx) error {
return c.Status(500).Render("views/home", fiber.Map{
"ERR": "Parsing Error",
"CI_COMMIT_SHORT_SHA": utils.CI_COMMIT_SHORT_SHA,
"CI_COMMIT_SHA": utils.CI_COMMIT_SHA,
"CI_COMMIT_BRANCH": utils.CI_COMMIT_BRANCH,
"CI_COMMIT_TAG": utils.CI_COMMIT_TAG,
"CI_TAGGED": utils.CI_TAGGED,
@ -50,7 +50,7 @@ func Posthome(c *fiber.Ctx) error {
return c.Status(424).Render("views/home", fiber.Map{
"ERR": "Invalid URL, please check and try again.",
"CI_COMMIT_SHORT_SHA": utils.CI_COMMIT_SHORT_SHA,
"CI_COMMIT_SHA": utils.CI_COMMIT_SHA,
"CI_COMMIT_BRANCH": utils.CI_COMMIT_BRANCH,
"CI_COMMIT_TAG": utils.CI_COMMIT_TAG,
"CI_TAGGED": utils.CI_TAGGED,
@ -73,7 +73,7 @@ func Posthome(c *fiber.Ctx) error {
return c.Status(500).Render("views/home", fiber.Map{
"ERR": err.Error(),
"CI_COMMIT_SHORT_SHA": utils.CI_COMMIT_SHORT_SHA,
"CI_COMMIT_SHA": utils.CI_COMMIT_SHA,
"CI_COMMIT_BRANCH": utils.CI_COMMIT_BRANCH,
"CI_COMMIT_TAG": utils.CI_COMMIT_TAG,
"CI_TAGGED": utils.CI_TAGGED,
@ -95,7 +95,7 @@ func Posthome(c *fiber.Ctx) error {
return c.Status(500).Render("views/home", fiber.Map{
"ERR": err.Error(),
"CI_COMMIT_SHORT_SHA": utils.CI_COMMIT_SHORT_SHA,
"CI_COMMIT_SHA": utils.CI_COMMIT_SHA,
"CI_COMMIT_BRANCH": utils.CI_COMMIT_BRANCH,
"CI_COMMIT_TAG": utils.CI_COMMIT_TAG,
"CI_TAGGED": utils.CI_TAGGED,
@ -123,7 +123,7 @@ func Posthome(c *fiber.Ctx) error {
return c.Status(201).Render("views/home", fiber.Map{
"URL": fURL,
"CI_COMMIT_SHORT_SHA": utils.CI_COMMIT_SHORT_SHA,
"CI_COMMIT_SHA": utils.CI_COMMIT_SHA,
"CI_COMMIT_BRANCH": utils.CI_COMMIT_BRANCH,
"CI_COMMIT_TAG": utils.CI_COMMIT_TAG,
"CI_TAGGED": utils.CI_TAGGED,

6
utils/build-vars.go
View file

@ -6,7 +6,7 @@ import (
)
var (
CI_COMMIT_SHORT_SHA string
CI_COMMIT_SHA string
CI_COMMIT_BRANCH string
CI_COMMIT_TAG string
CI_TAGGED bool
@ -14,7 +14,7 @@ var (
)
func Init_build_vars() {
CI_BUILD = CI_COMMIT_SHORT_SHA != "" || CI_COMMIT_BRANCH != ""
CI_BUILD = CI_COMMIT_SHA != "" || CI_COMMIT_BRANCH != ""
CI_TAGGED = CI_COMMIT_TAG != ""
}
@ -23,7 +23,7 @@ func Print_Starting_Screen() {
if CI_TAGGED {
version = CI_COMMIT_TAG
} else if CI_BUILD {
version = CI_COMMIT_SHORT_SHA
version = CI_COMMIT_SHA
}
fmt.Println("---- Starting goshorly " + version + " ----")
time.Sleep(1 * time.Second)

2
utils/limiter.go
View file

@ -19,7 +19,7 @@ var ConfigLimiter limiter.Config = limiter.Config{
}
return c.Render("views/home", fiber.Map{
"ERR": "You have reached the limit of requests! Please check back later. (1 minute)",
"CI_COMMIT_SHORT_SHA": CI_COMMIT_SHORT_SHA,
"CI_COMMIT_SHA": CI_COMMIT_SHA,
"CI_COMMIT_BRANCH": CI_COMMIT_BRANCH,
"CI_BUILD": CI_BUILD,
})

2
views/home.html
View file

@ -82,7 +82,7 @@
{{ if .CI_COMMIT_TAG }}
| {{ .CI_COMMIT_TAG }}
{{ else }}
| {{ .CI_COMMIT_SHORT_SHA }}/{{ .CI_COMMIT_BRANCH }}
| {{ .CI_COMMIT_SHA }}/{{ .CI_COMMIT_BRANCH }}
{{ end }}
{{ end }}
</center>