Merge branch 'main' into issue-495

Author: isc-etamarch

.github/workflows/main.yml

@@ -63,6 +63,7 @@ jobs:
         run: |
           echo "zpm \"install testcoverage\":1:1" > install-testcoverage
           docker exec --interactive $instance iris session $instance -B < install-testcoverage
+          chmod 777 $GITHUB_WORKSPACE
           
       - name: Build and Test
         run: |
@@ -72,7 +73,12 @@ jobs:
           echo "do \$System.OBJ.CompilePackage(\"$test_package\",\"ckd\") " > test.script
           # Run tests
           echo "zpm \"$package test -only $test_flags\":1:1" >> test.script
-          docker exec --interactive $instance iris session $instance -B < build.script && docker exec --interactive $instance iris session $instance -B < test.script &&bash <(curl -s https://codecov.io/bash)
+          docker exec --interactive $instance iris session $instance -B < build.script && docker exec --interactive $instance iris session $instance -B < test.script
+          
+      - name: Upload coverage reports to Codecov with GitHub Action
+        uses: codecov/[email protected]
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Produce CE Artifact
         run: |

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added warnings when user is using incompatible git version (#488)
 - Fixed the back button navigation between WebUI and Settings page (#361)
 - Fixed issues with HL7 file extension inconsistencies (#495)
+- Basic mode Sync operation now imports items changed on the remote merge branch (#506)
 
 ## [2.5.0] - 2024-09-24
 

cls/SourceControl/Git/Utils.cls

@@ -440,7 +440,7 @@ ClassMethod MergeDefaultRemoteBranch(Output alert As %String = "") As %Boolean
         do ..RunGitWithArgs(.errStream, .outStream, "fetch", "origin", defaultMergeBranch_":"_defaultMergeBranch)
         do ..PrintStreams(errStream, outStream)
 
-        do ..RunGitWithArgs(,.outStream, "rev-parse", defaultMergeBranch)
+        do ..RunGitWithArgs(,.outStream, "rev-parse", "HEAD")
         set startSha = outStream.ReadLine()
 
         // Start a transaction so code changes can be rolled back