diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4973dbfbbf001dd0608a025e3667e80aec85df3..01e2e8ccccd4a11fb33ea4e6f4db9c5fc896734a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -213,13 +213,12 @@ Trigger AWS Deployment: fi - | curl --request POST \ - --form token=${NSHMP_WS_STATIC_CDK_TRIGGER_TOKEN} \ + --form token=${NSHMP_CDK_TRIGGER_TOKEN} \ --form ref=${REF} \ --form "variables[description]=Triggered by nshmp-ws-static" \ --form "variables[ENVIRONMENT]=${ENVIRONMENT}" \ --form "variables[NSHMP_WS_STATIC_IMAGE]=${IMAGE_NAME}" \ - --form "variables[TRIGGER_PASSCODE]=${NSHMP_WS_STATIC_CDK_TRIGGER_TOKEN}" \ - "https://${PRIVATE_GITLAB}/api/v4/projects/${NSHMP_WS_STATIC_CDK_PROJECT_ID}/trigger/pipeline" + "https://${PRIVATE_GITLAB}/api/v4/projects/${NSHMP_CDK_PROJECT_ID}/trigger/pipeline" stage: trigger variables: REF: main diff --git a/gradle.properties b/gradle.properties index 54580ed9db2de6f8bf341bec3ac945bb1b63a349..3cdb0d0c7d7eb414ff9b02087922d719c86582b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,8 +7,8 @@ micronautRxVersion = 2.1.1 netcdfVersion = 5.5.2 nodePluginVersion = 3.0.1 nodeVersion = 16.3.0 -nshmpLibVersion = 1.0.6 -nshmpWsUtilsVersion = 0.3.10 +nshmpLibVersion = 1.3.10 +nshmpWsUtilsVersion = 0.3.12 openApiVersion = 4.0.0 shadowVersion = 7.1.1 slfVersion = 1.7.30 diff --git a/gradle/app-version.gradle b/gradle/app-version.gradle index 3022638738f2eeb93238901b44222561affd3f6b..433ace6efa13a86b38bbed5a6518835123ba0f22 100644 --- a/gradle/app-version.gradle +++ b/gradle/app-version.gradle @@ -4,21 +4,28 @@ tasks.withType(JavaCompile) { doFirst { def versionFile = new File("${projectDir}/src/main/resources/version/nshmp-ws-static-version.json") new File(versionFile.getParent()).mkdirs() - def details = versionDetails() - def ciProjectUrl = System.getenv("CI_PROJECT_URL") - def branch = System.getenv("CI_COMMIT_BRANCH") - def versionInfo = [ - branchName: branch ? branch : details.branchName, - commitDistance: details.commitDistance, - gitHash: details.gitHash, - gitHashFull: details.gitHashFull, - isCleanTag: details.isCleanTag, - lastTag: details.lastTag, - projectName: rootProject.name, - url: ciProjectUrl ? ciProjectUrl : 'git config --get remote.origin.url'.execute().text.replace('\n', ''), - version: details.version, - ] - def json = groovy.json.JsonOutput.toJson(versionInfo) - versionFile.write(groovy.json.JsonOutput.prettyPrint(json)) + + try { + def details = versionDetails() + def ciProjectUrl = System.getenv("CI_PROJECT_URL") + def branch = System.getenv("CI_COMMIT_BRANCH") + def versionInfo = [ + branchName: branch ? branch : details.branchName, + commitDistance: details.commitDistance, + gitHash: details.gitHash, + gitHashFull: details.gitHashFull, + isCleanTag: details.isCleanTag, + lastTag: details.lastTag, + projectName: project.name, + url: ciProjectUrl ? ciProjectUrl : "git config --get remote.origin.url".execute().text.replace("\n", ""), + version: details.version, + ] + def json = groovy.json.JsonOutput.toJson(versionInfo) + versionFile.write(groovy.json.JsonOutput.prettyPrint(json)) + } catch (Exception e) { + println("Failed to create version file. Writing blank file.") + println(e) + versionFile.write('{}') + } } }