Merge pull request #19 from intersystems/fix-worfklow-iris-version

Use latest IRIS community in workflow
intersystems · Dec 1, 2023 · 4565f01 · 4565f01
2 parents fa36455 + 40e76da
commit 4565f01
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
     env:
       # ** FOR GENERAL USE, LIKELY NEED TO CHANGE: **
       package: TestCoverage
-      container_image: intersystemsdc/iris-community:2019.4.0.383.0-zpm
+      container_image: intersystemsdc/iris-community:latest
 
       # ** FOR GENERAL USE, MAY NEED TO CHANGE: **
       build_flags: -dev -verbose # Load in -dev mode to get unit test code preloaded
@@ -81,4 +81,4 @@ jobs:
       if: always()
       with:
         name: ${{ steps.xunit-viewer.outputs.report-name }}
-        path: ${{ steps.xunit-viewer.outputs.report-dir }}
+        path: ${{ steps.xunit-viewer.outputs.report-dir }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,15 @@
+# TestCoverage
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [2.1.4] - Unreleased
+
+### Fixed
+- #18: EOL normalization in coverage.list
+- #19: Update CI to latest IRIS community (and corresponding test updates)
+
+## [2.1.3] - 2022-03-30
+- Last released version before CHANGELOG existed.
diff --git a/internal/testing/unit_tests/UnitTest/TestCoverage/Unit/TestComplexity.cls b/internal/testing/unit_tests/UnitTest/TestCoverage/Unit/TestComplexity.cls
@@ -225,8 +225,9 @@ Method FunctionWithAppropriateScope(pArgument As %String)
 	Quit tSC
 }
 
-/// Complexity: 7 (1 + UCQ)
-/// Was 2 on earlier IRIS versions; UCQ adds a bit.
+/// Complexity: 14 (1 + UCQ)
+/// Was 2, and then 7, on earlier IRIS versions; UCQ adds a bit (and then a bit more)
+/// At some point we might want to just remove this test
 Method MethodWithEmbeddedSQL()
 {
 	&sql(select top 1 1 into :foo)

diff --git a/module.xml b/module.xml
@@ -2,7 +2,7 @@
 <Export generator="Cache" version="25">
 <Document name="TestCoverage.ZPM"><Module>
   <Name>TestCoverage</Name>
-  <Version>2.1.3</Version>
+  <Version>2.1.4</Version>
   <Description>Run your typical ObjectScript %UnitTest tests and see which lines of your code are executed. Includes Cobertura-style reporting for use in continuous integration tools.</Description>
   <Packaging>module</Packaging>
   <Resources>