Skip to content

Commit e24217d

Browse files
authored
updating building and release process (#7)
- release from unknown to - - adding step to configure build info - adding initializer function
1 parent e24f5cb commit e24217d

File tree

3 files changed

+28
-13
lines changed

3 files changed

+28
-13
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,15 @@ jobs:
5353
username: ${{ github.actor }}
5454
password: ${{ secrets.GITHUB_TOKEN }}
5555

56+
- name: Configure build information
57+
id: build_information
58+
run: |
59+
if [[ ${{ github.ref_type }} == "tag" ]]; then
60+
echo "::set-output name=release_name::$( echo ${{ github.ref_name }} )"
61+
else
62+
echo "::set-output name=release_name::$( echo unknown )"
63+
fi
64+
5665
- name: Build and push
5766
uses: docker/build-push-action@v2.7.0
5867
with:
@@ -66,5 +75,5 @@ jobs:
6675
cache-to: type=local,dest=/tmp/.buildx-cache
6776
build-args: |
6877
TibiadataBuildBuilder=github
69-
TibiadataBuildRelease=${{ github.ref_name }}
78+
TibiadataBuildRelease=${{ steps.build_information.outputs.release_name }}
7079
TibiadataBuildCommit=${{ github.sha }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM golang:1.17.5
33

44
# get args
55
ARG TibiadataBuildBuilder=dockerfile
6-
ARG TibiadataBuildRelease=unknown
6+
ARG TibiadataBuildRelease=-
77
ARG TibiadataBuildCommit=-
88

99
# create and set workingfolder

src/webserver.go

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ func main() {
4444
// logging start of TibiaData
4545
log.Printf("[info] TibiaData API starting..")
4646

47+
// running the TibiaDataInitializer function
48+
TibiaDataInitializer()
49+
50+
// logging build information
51+
log.Printf("[info] TibiaData API release: %s", TibiadataBuildRelease)
52+
log.Printf("[info] TibiaData API build: %s", TibiadataBuildBuilder)
53+
log.Printf("[info] TibiaData API commit: %s", TibiadataBuildCommit)
54+
log.Printf("[info] TibiaData API edition: %s", TibiadataBuildEdition)
55+
4756
// setting application to ReleaseMode if DEBUG_MODE is false
4857
if !getEnvAsBool("DEBUG_MODE", false) {
4958
// setting GIN_MODE to ReleaseMode
@@ -124,16 +133,18 @@ func main() {
124133
})
125134
})
126135

127-
// logging build information
128-
log.Printf("[info] TibiaData API release: %s", TibiadataBuildRelease)
129-
log.Printf("[info] TibiaData API build: %s", TibiadataBuildBuilder)
130-
log.Printf("[info] TibiaData API commit: %s", TibiadataBuildCommit)
131-
log.Printf("[info] TibiaData API edition: %s", TibiadataBuildEdition)
132-
133136
// Start the router
134137
router.Run() // listen and serve on 0.0.0.0:8080 (for windows "localhost:8080")
135138
}
136139

140+
// TibiaDataInitializer func - init things at beginning
141+
func TibiaDataInitializer() {
142+
// setting TibiadataBuildEdition
143+
if isEnvExist("TIBIADATA_EDITION") {
144+
TibiadataBuildEdition = getEnv("TIBIADATA_EDITION", "open-source")
145+
}
146+
}
147+
137148
/*
138149
// TibiaDataAPIHandleErrorResponse func - handling of responses..
139150
func TibiaDataAPIHandleErrorResponse(c *gin.Context, s1 string, s2 string, s3 string) {
@@ -176,11 +187,6 @@ func TibiadataUserAgentGenerator(version int) string {
176187
TibiadataHost = "+https://" + TibiadataHost
177188
}
178189

179-
// setting TibiadataBuildEdition
180-
if isEnvExist("TIBIADATA_EDITION") {
181-
TibiadataBuildEdition = getEnv("TIBIADATA_EDITION", "open-source")
182-
}
183-
184190
// adding details in parenthesis
185191
useragentDetails := []string{
186192
"release/" + TibiadataBuildRelease,

0 commit comments

Comments
 (0)