Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into master for release #3658

Merged
merged 20 commits into from
Nov 27, 2024
Merged
Changes from 3 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b628564
fixed web-ui release workflow #3620
sven-dmlr Nov 15, 2024
c4f661a
Merge pull request #3621 from mercedes-benz/feature-3620-web-ui-fix-r…
sven-dmlr Nov 18, 2024
f9d9404
Merge pull request #3624 from mercedes-benz/master
sven-dmlr Nov 18, 2024
b0dcffc
env files updated #3623
sven-dmlr Nov 18, 2024
ab9dd5f
Merge pull request #3626 from mercedes-benz/feature-3623-web-ui-versi…
sven-dmlr Nov 18, 2024
6dc3cc5
Implement localization for web-ui (#3630)
lorriborri Nov 20, 2024
7086228
removed deprecated external access from web-server #3631
sven-dmlr Nov 20, 2024
55b8b38
Merge pull request #3638 from mercedes-benz/feature-3631-web-server-r…
sven-dmlr Nov 21, 2024
b0992bd
add logback-spring.xml to SecHub WebServer #3639 (#3640)
hamidonos Nov 21, 2024
847255d
Web UI navigation bar (#3637)
lorriborri Nov 22, 2024
4a969ca
removed timestamp from builds #3641
sven-dmlr Nov 22, 2024
2072612
tweak Go compile flags to make builds reproducible #3641
sven-dmlr Nov 22, 2024
7338aea
Merge pull request #3642 from mercedes-benz/feature-3641-make-client-…
sven-dmlr Nov 25, 2024
4497cd1
documented dev tagging for published artifacts #3433
sven-dmlr Nov 25, 2024
a0236d3
Merge pull request #3645 from mercedes-benz/feature-3433-SNAPSHOT-tag…
sven-dmlr Nov 25, 2024
9fbe905
Added themes and Project Overview Page
lorriborri Nov 26, 2024
7fc64db
Added query parameters to generated documentation output #3647
de-jcup Nov 26, 2024
ca830a6
Fix scope calculation #3652
de-jcup Nov 26, 2024
7845eca
Merge pull request #3651 from mercedes-benz/feature-3647-add-query-pa…
de-jcup Nov 27, 2024
00c53a7
Feature 3646 client debian packages #3646 (#3654)
sven-dmlr Nov 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions gradle/build-versioning.gradle
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ def buildVersionFiles(){
def noStagedChanges = stagedChanges.getAllChanges().isEmpty()
def hasChanged = !noUnstagedChanges || !noStagedChanges
def buildNumber = getBuildNr()
def docsTimeStamp = getLocalBuildNr()
def docsTimeStamp = getTimeStamp()
def currentGitCommit = git.head().abbreviatedId

// ------------------------
@@ -336,8 +336,8 @@ def buildVersionString(commitTag, boolean hasChanged, buildNumber){
calcversion = calcversion - "-libraries"
calcversion = calcversion - "-pds-tools"
calcversion = calcversion - "-pds"
calcversion = calcversion - "-server"
calcversion = calcversion - "-web-server"
calcversion = calcversion - "-server"
calcversion = calcversion - "-checkmarx-wrapper"
calcversion = calcversion - "-owaspzap-wrapper"
calcversion = calcversion - "-prepare-wrapper"
@@ -349,29 +349,31 @@ def buildVersionString(commitTag, boolean hasChanged, buildNumber){
if (hasChanged){
calcversion = "${calcversion}-dirty"
}
calcversion = "${calcversion}-${buildNumber}"
if (buildNumber != "") {
calcversion = "${calcversion}-${buildNumber}"
}
return calcversion
}

def getBuildNr(){
if (getServerBuildNr()!=null){
if (getServerBuildNr()!=null) {
return "b"+getServerBuildNr()
}else{
} else {
if (project.hasProperty('sechub.build.timestamp')){
if (project.getProperty('sechub.build.timestamp')=="false"){
return "latest"
}
}
return getLocalBuildNr()
return ""
}
}

def getServerBuildNr(){
return System.getenv('BUILD_NUMBER' )
}

def getLocalBuildNr() {
return new Date().format('yyyyMMddHHmmss')
def getTimeStamp() {
return new Date().format("yyyy-MM-dd HH:mm ('UTC'X)")
}


5 changes: 3 additions & 2 deletions sechub-cli/build_go.sh
Original file line number Diff line number Diff line change
@@ -64,7 +64,8 @@ init_go_modules
cd "$SRC_PATH/main"

export CGO_ENABLED=0 # This forces statically linked binaries
GO_LD_FLAGS="-s -w" # strip (reduce size): disable debug symbol table / disable DWARF generation
GO_LD_FLAGS="-s -w -buildid=" # strip (reduce size): disable debug symbol table / disable DWARF generation
GO_COMPILE_FLAGS="-trimpath" # Aim to make builds reproducible

for platform in "${platforms[@]}" ; do
platform_split=(${platform//\// })
@@ -82,7 +83,7 @@ for platform in "${platforms[@]}" ; do
fi

echo "> building $targetSubFolder"
go build -ldflags="$GO_LD_FLAGS" -o "$buildDir/$output_name" .
go build $GO_COMPILE_FLAGS -ldflags="$GO_LD_FLAGS" -o "$buildDir/$output_name" .
if [ $? -ne 0 ]; then
echo 'Go build failed because of an error'
exit 1