Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Test
run: ./scripts/integrationTest.sh
windows:
runs-on: windows-2019
runs-on: windows-latest
steps:
- name: Install Go
uses: actions/setup-go@v2
Expand Down
2 changes: 1 addition & 1 deletion dockerHelper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func CreateDockerfile(imageName string, dockerFROM string, dockerCMD string, doc
}

baseWindowsDockerFrom := []string{
"FROM mcr.microsoft.com/windows/servercore:ltsc2019",
"FROM mcr.microsoft.com/windows/servercore:ltsc2022",
`SHELL ["powershell"]`,
"RUN NET USER nrdiagadmin /add",
"RUN NET LOCALGROUP administrators /add nrdiagadmin",
Expand Down
3 changes: 3 additions & 0 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ VERSION=$(cat releaseVersion.txt | awk -F'majorMinor=' '{printf$2}')
BUILD_TIMESTAMP=$(date -u '+%Y-%m-%d_%I:%M:%S%p')
LDFLAGS="-s -w -X ${CONFIG_PATH}.Version=${VERSION}.${VERSION_NUMBER} -X ${CONFIG_PATH}.BuildTimestamp=${BUILD_TIMESTAMP} -X ${CONFIG_PATH}.USUsageEndpoint=${US_USAGE_ENDPOINT} -X ${CONFIG_PATH}.USAttachmentEndpoint=${US_ATTACHMENT_ENDPOINT} -X ${CONFIG_PATH}.USHaberdasherURL=${US_HABERDASHER_URL} -X ${CONFIG_PATH}.EUUsageEndpoint=${EU_USAGE_ENDPOINT} -X ${CONFIG_PATH}.EUAttachmentEndpoint=${EU_ATTACHMENT_ENDPOINT} -X ${CONFIG_PATH}.EUHaberdasherURL=${EU_HABERDASHER_URL}"

# Disable CGO to ensure we're using pure go and to fix 'version `GLIBC_2.34' not found' errors
CGO_ENABLED=0

# Set version based on version.txt file and auto version number
echo "Build version is $VERSION.$VERSION_NUMBER"
echo "Buildstamp is $BUILD_TIMESTAMP"
Expand Down
Loading