Merge pull request #90 from craigatk/release-version

(fix) Including release version in .jar that gets published
craigatk · May 10, 2020 · c0d37ee · c0d37ee
2 parents ee647e7 + 1d2ae10
commit c0d37ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/release-server.yml b/.github/workflows/release-server.yml
@@ -72,7 +72,7 @@ jobs:
           DB_URL: "jdbc:postgresql://localhost:5432/projektordb"
           CACHE_ACCESS_KEY: ${{ secrets.CACHE_ACCESS_KEY }}
           CACHE_SECRET_KEY: ${{ secrets.CACHE_SECRET_KEY }}
-        run: ./gradlew :functional-test:functionalTest
+        run: ./gradlew :functional-test:functionalTest -PreleaseVersion=${{ env.RELEASE_VERSION }}
 
       - name: Create Release
         id: create_release

diff --git a/server/server-app/build.gradle b/server/server-app/build.gradle
@@ -84,6 +84,7 @@ task writeVersion() {
     outputs.cacheIf { true }
 
     doLast {
+        println "Writing server version $projectVersion"
         new File("$projectDir/src/main/resources/version.json").text = """{
   "version": "$projectVersion"
 }"""