diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e7479fa640..84be9cd108 100644 --- 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 @@ -344,8 +344,8 @@ 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: | @@ -353,11 +353,11 @@ jobs: # 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 @@ -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/package-lock.json b/package-lock.json index 322e56849b..608ddbba3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,7 +74,7 @@ "string-punctuation-tokenizer": "^2.2.0", "sudo-prompt": "6.2.1", "tc-electron-env": "0.10.0", - "tc-source-content-updater": "1.4.28", + "tc-source-content-updater": "1.4.29", "tc-strings": "0.1.7", "tc-tool": "4.1.0", "tc-ui-toolkit": "6.2.9", @@ -24454,9 +24454,9 @@ } }, "node_modules/tc-source-content-updater": { - "version": "1.4.28", - "resolved": "https://registry.npmjs.org/tc-source-content-updater/-/tc-source-content-updater-1.4.28.tgz", - "integrity": "sha512-4jloDRbAmbnj5w0/whwN2n8ZgQ3hfTcRdn2elTydSBu2v4FzeyDsIVXGaSQjRig4T6YnoGQXV8b6f7qwF92Fpw==", + "version": "1.4.29", + "resolved": "https://registry.npmjs.org/tc-source-content-updater/-/tc-source-content-updater-1.4.29.tgz", + "integrity": "sha512-CB/h1clqL9+iio4n/B066L6aX3Mkaes+ZEy7c1ojD+a5RzzfyUyLbgFciB8HFuMMFs2WAjDfcFyNJAvwqYgmPg==", "dependencies": { "adm-zip": "^0.4.11", "agentkeepalive": "4.1.0", @@ -47864,9 +47864,9 @@ } }, "tc-source-content-updater": { - "version": "1.4.28", - "resolved": "https://registry.npmjs.org/tc-source-content-updater/-/tc-source-content-updater-1.4.28.tgz", - "integrity": "sha512-4jloDRbAmbnj5w0/whwN2n8ZgQ3hfTcRdn2elTydSBu2v4FzeyDsIVXGaSQjRig4T6YnoGQXV8b6f7qwF92Fpw==", + "version": "1.4.29", + "resolved": "https://registry.npmjs.org/tc-source-content-updater/-/tc-source-content-updater-1.4.29.tgz", + "integrity": "sha512-CB/h1clqL9+iio4n/B066L6aX3Mkaes+ZEy7c1ojD+a5RzzfyUyLbgFciB8HFuMMFs2WAjDfcFyNJAvwqYgmPg==", "requires": { "adm-zip": "^0.4.11", "agentkeepalive": "4.1.0", diff --git a/package.json b/package.json index 894b4ba07f..f06684c3c2 100644 --- a/package.json +++ b/package.json @@ -186,7 +186,7 @@ "string-punctuation-tokenizer": "^2.2.0", "sudo-prompt": "6.2.1", "tc-electron-env": "0.10.0", - "tc-source-content-updater": "1.4.28", + "tc-source-content-updater": "1.4.29", "tc-strings": "0.1.7", "tc-tool": "4.1.0", "tc-ui-toolkit": "6.2.9", diff --git a/src/js/actions/MyProjects/ProjectLoadingActions.js b/src/js/actions/MyProjects/ProjectLoadingActions.js index 0ebd5b33bc..96f11f7c46 100644 --- a/src/js/actions/MyProjects/ProjectLoadingActions.js +++ b/src/js/actions/MyProjects/ProjectLoadingActions.js @@ -419,13 +419,14 @@ export const showInvalidOrigLangVersionError = (manifest) => (dispatch, getState const upgradeText = translate('buttons.update_version'); const bookId = manifest?.project?.id || ''; const { bibleId: origLangBibleId, languageId: origLangId } = BibleHelpers.getOrigLangforBook(bookId); - const origLangOwnerForWA = manifest?.toolsSelectedOwners?.wordAlignment; + let origLangOwnerForWA = manifest?.toolsSelectedOwners?.wordAlignment; + origLangOwnerForWA = getOriginalLangOwner(origLangOwnerForWA || DEFAULT_ORIG_LANG_OWNER); const origLangEditVersionForWA = manifest?.tc_orig_lang_check_version_wordAlignment; const missingOLResource = { languageId: origLangId, resourceId: origLangBibleId, version: origLangEditVersionForWA || 'master', - owner: origLangOwnerForWA || DEFAULT_ORIG_LANG_OWNER, + owner: origLangOwnerForWA, }; console.log(`showInvalidOrigLangVersionError() - get missing OL resource: ${JSON.stringify(missingOLResource)}`);