Merge remote-tracking branch 'origin/release-v3.6.6' into release-v3.…

…6.6-Search # Conflicts: # package-lock.json # package.json
unfoldingWord · Oct 18, 2024 · b78e6b7 · b78e6b7
2 parents df0224f + 635b02f
commit b78e6b7
Show file tree

Hide file tree

Showing 162 changed files with 73,988 additions and 315 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -113,11 +113,11 @@ jobs:
 #        skip_fetch: true
 #        skip_checkout: true
 
-    - uses: actions/upload-artifact@v1
+    - uses: actions/upload-artifact@v4
       name: Upload jsdocs
       with:
         name: jsdocs
-        path: ./docs/
+        path: docs/
 
   build-linux:
     name: Build Linux
@@ -222,13 +222,13 @@ jobs:
         run: echo "ARTIFACT_ARM64=$(echo "$APP_NAME-linux-arm64-$APP_VERSION-LITE-$HASH.deb")" >> $GITHUB_ENV
 
       - name: bundle arm64 linux
-        run: ./node_modules/.bin/gulp release-linux-deb-arm64 --out=../artifacts/arm64/$ARTIFACT_ARM64
+        run: ./node_modules/.bin/gulp release-linux-deb-arm64 --out=artifacts/arm64/$ARTIFACT_ARM64
 
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         name: Upload arm64 artifacts
         with:
           name: ${{ env.ARTIFACT_ARM64 }}
-          path: ../artifacts/arm64/
+          path: artifacts/arm64/
 
       #     x64
       - name: Set x64 MAX artifact name
@@ -239,13 +239,13 @@ jobs:
         run: echo "ARTIFACT_X64=$(echo "$APP_NAME-linux-x64-$APP_VERSION-LITE-$HASH.deb")" >> $GITHUB_ENV
 
       - name: bundle x64 linux
-        run: ./node_modules/.bin/gulp release-linux-deb --out=../artifacts/x64/$ARTIFACT_X64
+        run: ./node_modules/.bin/gulp release-linux-deb --out=artifacts/x64/$ARTIFACT_X64
 
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         name: Upload x64 artifacts
         with:
           name: ${{ env.ARTIFACT_X64 }}
-          path: ../artifacts/x64/
+          path: artifacts/x64/
 
   build-windows:
     name: Build Windows
@@ -264,7 +264,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v1
         with:
-          node-version: '16.4.2'
+          node-version: '16.14.2'
 
       - name: TRIM setting
         run: echo "Trim value is $TRIM"
@@ -344,20 +344,20 @@ jobs:
 
       - name: bundle x64 windows
         run: |
-          echo "Generating executable ../artifacts/x64/${{ env.ARTIFACT_X64 }}"
-          ./node_modules/.bin/gulp release-win64 --out=../artifacts/x64/${{ env.ARTIFACT_X64 }}
+          echo "Generating executable artifacts/x64/${{ env.ARTIFACT_X64 }}"
+          ./node_modules/.bin/gulp release-win64 --out=artifacts/x64/${{ env.ARTIFACT_X64 }}
 
 #      - name: list directories
 #        run: |
 #          dir .
 #          dir ../
 #          dir ../artifacts
 
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         name: Upload x64 artifacts
         with:
           name: ${{ env.ARTIFACT_X64 }}
-          path: ../artifacts/x64/
+          path: artifacts/x64/
 #     x32
       - name: Set x32 MAX artifact name
         run: echo "ARTIFACT_X32=$(echo "${{ env.APP_NAME }}-win-x32-${{ env.APP_VERSION }}-MAX-${{ env.HASH }}.exe")" >> $GITHUB_ENV
@@ -370,14 +370,14 @@ jobs:
 
       - name: bundle x32 windows
         run: |
-          echo "Generating executable ../artifacts/x32/${{ env.ARTIFACT_X32 }}"
-          ./node_modules/.bin/gulp release-win32 --out=../artifacts/x32/${{ env.ARTIFACT_X32 }}
+          echo "Generating executable artifacts/x32/${{ env.ARTIFACT_X32 }}"
+          ./node_modules/.bin/gulp release-win32 --out=artifacts/x32/${{ env.ARTIFACT_X32 }}
 
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         name: Upload x32 artifacts
         with:
           name: ${{ env.ARTIFACT_X32 }}
-          path: ../artifacts/x32/
+          path: artifacts/x32/
 
   build-macos:
     name: Build macOS
@@ -396,7 +396,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v1
         with:
-          node-version: '16.4.2'
+          node-version: '16.14.2'
 
       - name: TRIM setting
         run: echo "Trim value is $TRIM"
@@ -479,13 +479,13 @@ jobs:
         run: echo "ARTIFACT_X64=$(echo "$APP_NAME-macos-x64-$APP_VERSION-LITE-$HASH.dmg")" >> $GITHUB_ENV
 
       - name: bundle x64 macOS
-        run: ./node_modules/.bin/gulp release-macos --out=../artifacts/x64/$ARTIFACT_X64
+        run: ./node_modules/.bin/gulp release-macos --out=artifacts/x64/$ARTIFACT_X64
 
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         name: Upload x64 artifacts
         with:
           name: ${{ env.ARTIFACT_X64 }}
-          path: ../artifacts/x64/
+          path: artifacts/x64/
 
       #     universal build
       - name: Set universal MAX artifact name
@@ -496,13 +496,13 @@ jobs:
         run: echo "ARTIFACT_UNIV=$(echo "$APP_NAME-macos-universal-$APP_VERSION-LITE-$HASH.dmg")" >> $GITHUB_ENV
 
       - name: bundle universal macOS
-        run: ./node_modules/.bin/gulp release-macos-universal --out=../artifacts/universal/$ARTIFACT_UNIV
+        run: ./node_modules/.bin/gulp release-macos-universal --out=artifacts/universal/$ARTIFACT_UNIV
 
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         name: Upload universal artifacts
         with:
           name: ${{ env.ARTIFACT_UNIV }}
-          path: ../artifacts/universal/
+          path: artifacts/universal/
 
   notify:
     name: Notify

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Changelog
 
 
+## [v3.6.5](https://github.com/unfoldingWord/translationCore/tree/v3.6.5) (2024-07-12)
+
+**Fixed bugs:**
+-  Do not fail downloads of resources due to missing files  [\#7580](https://github.com/unfoldingWord/translationCore/issues/7580)
+-  Highlights not working for a loaded Aligned Bible resource  [\#7576](https://github.com/unfoldingWord/translationCore/issues/7576)
+
+
+
 ## [v3.6.4](https://github.com/unfoldingWord/translationCore/tree/v3.6.4) (2024-03-21)
 
 **Fixed bugs:**

diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "translationCore",
   "productName": "translationCore",
-  "version": "3.6.5-search",
-  "minCompatibleVersion": "3.6.0",
+  "version": "3.6.6-search",
+  "minCompatibleVersion": "3.6.6",
   "manifestVersion": "8",
   "description": "A bridge between TS and TM",
   "main": "main.js",
@@ -47,7 +47,7 @@
     "overwrite-resources": "rm -rf tcResources/en/bibles tcResources/en/translationHelps tcResources/el-x-koine tcResources/hi && npm run update-resources",
     "update-apps": "git submodule foreach --recursive git checkout develop && git submodule foreach --recursive git pull",
     "update-attributions": "node scripts/attributions/generateAttributionData.js src/js/components/home/license/attributionData.json",
-    "update-resources": "node scripts/resources/updateResources.js tcResources en hi el-x-koine hbo --allAlignedBibles --uWoriginalLanguage",
+    "update-resources": "node scripts/resources/updateResources.js tcResources en hi el-x-koine hbo --allAlignedBibles --uWoriginalLanguage --unfoldingWordOrg --preProd",
     "update-version": "node ./scripts/versionScript.js"
   },
   "repository": {
@@ -187,13 +187,13 @@
     "string-punctuation-tokenizer": "^2.2.0",
     "sudo-prompt": "6.2.1",
     "tc-electron-env": "0.10.0",
-    "tc-source-content-updater": "1.4.25",
+    "tc-source-content-updater": "1.4.29",
     "tc-strings": "0.1.7",
     "tc-tool": "4.1.0",
     "tc-ui-toolkit": "6.2.9",
     "truncate-utf8-bytes": "1.0.2",
     "tsv-groupdata-parser": "1.1.0",
-    "usfm-js": "3.4.2",
+    "usfm-js": "3.4.3",
     "uuid": "3.2.1",
     "word-aligner": "1.0.2",
     "wordmap": "0.8.2",
@@ -203,7 +203,7 @@
     "zip-folder": "1.0.0"
   },
   "engines": {
-    "node": ">=16.4.0",
+    "node": ">=16.14.0 <16.15",
     "npm": ">=7.18.1"
   }
 }