Merge pull request #33 from mtrewartha/26-run-ci-on-prs-and-pushes-to…

…-main Add tests workflow for PRs and pushes to main
mtrewartha · Dec 9, 2023 · 186ab49 · 186ab49
2 parents 0d8fefa + 5f192af
commit 186ab49
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 5 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -0,0 +1,29 @@
+name: Checks
+on:
+  pull_request:
+  push:
+    branches:
+      - 'main'
+jobs:
+  tests:
+    name: 'Tests'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Check out the repository'
+        uses: actions/checkout@v4
+      - name: 'Set up the JDK'
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+      - name: 'Set up the Android SDK'
+        uses: android-actions/setup-android@v3
+      - name: 'Run tests'
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: test
+      - name: 'Publish test report'
+        uses: mikepenz/action-junit-report@v4
+        if: success() || failure() # always run even if the previous step fails
+        with:
+          report_paths: '**/build/test-results/**/TEST-*.xml'
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,3 +1,4 @@
+import java.nio.file.NoSuchFileException
 import org.jetbrains.kotlin.konan.properties.loadProperties
 
 plugins {
@@ -21,11 +22,15 @@ android {
 
     signingConfigs {
         create("release") {
-            val uploadKeystoreProperties = loadProperties(PROPERTIES_FILE_PATH)
-            storeFile = file(uploadKeystoreProperties.getProperty(PROPERTIES_KEY_STORE_FILE))
-            storePassword = uploadKeystoreProperties.getProperty(PROPERTIES_KEY_STORE_PASSWORD)
-            keyAlias = uploadKeystoreProperties.getProperty(PROPERTIES_KEY_ALIAS)
-            keyPassword = uploadKeystoreProperties.getProperty(PROPERTIES_KEY_PASSWORD)
+            try {
+                val uploadKeystoreProperties = loadProperties(PROPERTIES_FILE_PATH)
+                storeFile = file(uploadKeystoreProperties.getProperty(PROPERTIES_KEY_STORE_FILE))
+                storePassword = uploadKeystoreProperties.getProperty(PROPERTIES_KEY_STORE_PASSWORD)
+                keyAlias = uploadKeystoreProperties.getProperty(PROPERTIES_KEY_ALIAS)
+                keyPassword = uploadKeystoreProperties.getProperty(PROPERTIES_KEY_PASSWORD)
+            } catch (_: NoSuchFileException) {
+                // Builds can't be signed for upload to store unless properties file is loaded
+            }
         }
     }
     compileSdk = libs.versions.android.sdk.compile.get().toInt()

diff --git a/app/src/test/kotlin/io/trewartha/positional/domain/sun/LocalSolarTimesRepositorySpec.kt b/app/src/test/kotlin/io/trewartha/positional/domain/sun/LocalSolarTimesRepositorySpec.kt
@@ -7,6 +7,7 @@ import io.trewartha.positional.data.sun.LibrarySolarTimesRepository
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalTime
 import kotlinx.datetime.Month
+import java.util.TimeZone
 
 private val JAN_1_2000 = LocalDate(2000, Month.JANUARY, 1)
 private val MAR_1_2000 = LocalDate(2000, Month.MARCH, 1)
@@ -16,6 +17,7 @@ private val DEC_1_2000 = LocalDate(2000, Month.DECEMBER, 1)
 
 class LocalSolarTimesRepositorySpec : BehaviorSpec({
 
+    lateinit var originalDefaultTimeZone: TimeZone
     lateinit var subject: LibrarySolarTimesRepository
 
     val dates = listOf(JAN_1_2000, MAR_1_2000, JUN_1_2000, SEP_1_2000, DEC_1_2000)
@@ -24,9 +26,15 @@ class LocalSolarTimesRepositorySpec : BehaviorSpec({
     val coordinates = Coordinates(46.7867, -92.1005)
 
     beforeTest {
+        originalDefaultTimeZone = TimeZone.getDefault()
+        TimeZone.setDefault(TimeZone.getTimeZone("America/Chicago")) // Time zone for Duluth above
         subject = LibrarySolarTimesRepository()
     }
 
+    afterTest {
+        TimeZone.setDefault(originalDefaultTimeZone)
+    }
+
     given("a date at a specific location") {
         `when`("astronomical dawn is calculated") {
             val astronomicalDawns = dates.associateWith { date ->