Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v3.6.6 #7596

Merged
merged 10 commits into from
Sep 21, 2024
Merged

Release v3.6.6 #7596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e449ae2
update CHANGELOG.md
Jun 20, 2024
f5154c6
Merge pull request #7579 from unfoldingWord/update-change-log
PhotoNomad0 Jun 20, 2024
ce7e827
update CHANGELOG.md
Jul 12, 2024
638cab7
Merge remote-tracking branch 'origin/release-v3.6.5' into merge-relea…
Jul 13, 2024
ce72ebe
Merge branch 'update-change-log.2' into merge-release-to-develop
Jul 13, 2024
a7c868d
Merge pull request #7583 from unfoldingWord/merge-release-to-develop
PhotoNomad0 Jul 14, 2024
37278f2
Bugfix / fix usfm and Door43-Catalog download (#7587)
PhotoNomad0 Aug 27, 2024
898ab1e
Bugfix / fix dcs search (#7589)
PhotoNomad0 Sep 5, 2024
d22e4d4
clear out older resources (#7590)
PhotoNomad0 Sep 6, 2024
635b02f
bugfix / fix owner for missing original language (#7591)
PhotoNomad0 Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:**
Expand Down
37 changes: 20 additions & 17 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "translationCore",
"productName": "translationCore",
"version": "3.6.5",
"minCompatibleVersion": "3.6.0",
"version": "3.6.6",
"minCompatibleVersion": "3.6.6",
"manifestVersion": "8",
"description": "A bridge between TS and TM",
"main": "main.js",
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -186,13 +186,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",
Expand All @@ -202,7 +202,7 @@
"zip-folder": "1.0.0"
},
"engines": {
"node": ">=16.4.0",
"node": ">=16.14.0 <16.15",
"npm": ">=7.18.1"
}
}
Loading
Loading