diff --git a/.github/workflows/theseus-release.yml b/.github/workflows/theseus-release.yml index 2d76ff24..85ea820b 100644 --- a/.github/workflows/theseus-release.yml +++ b/.github/workflows/theseus-release.yml @@ -125,7 +125,7 @@ jobs: TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} - name: upload ${{ matrix.platform }} - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: ${{ matrix.platform }} path: | diff --git a/apps/app-frontend/src/components/ui/RunningAppBar.vue b/apps/app-frontend/src/components/ui/RunningAppBar.vue index a23fa050..dd5dfe7a 100644 --- a/apps/app-frontend/src/components/ui/RunningAppBar.vue +++ b/apps/app-frontend/src/components/ui/RunningAppBar.vue @@ -50,13 +50,14 @@

The new version of the AstralRinth launcher is available.

Your version is outdated. We recommend that you update to the latest version.

-

Warning:

+

⚠️ Warning ⚠️

Before updating, make sure that you have saved all running instances and made a backup copy of the instances that are valuable to you. Remember that the authors of the product are not responsible for the breakdown of your files, so you should always make copies of them and keep them in a safe place.

+ Source • Git Astralium Version on remote server •

Version on local device •

v{{ version }}

diff --git a/apps/app-frontend/src/helpers/update.js b/apps/app-frontend/src/helpers/update.js index 22368951..8581190b 100644 --- a/apps/app-frontend/src/helpers/update.js +++ b/apps/app-frontend/src/helpers/update.js @@ -11,10 +11,8 @@ export const latestBetaCommitLink = ref('') export const launcherUrl = 'https://www.astralium.su/get/ar' const os = ref('') -const releaseLink = `https://api.github.com/repos/DIDIRUS4/AstralRinth/releases/latest` -const branchesLink = `https://api.github.com/repos/DIDIRUS4/AstralRinth/branches` +const releaseLink = `https://git.astralium.su/api/v1/repos/didirus/AstralRinth/releases/latest` const failedFetch = [`Failed to fetch remote releases:`, `Failed to fetch remote commits:`] -const betaBranch = `beta` // Github repository beta branch const osNames = ['macos', 'windows', 'linux'] const macExtension = `.dmg` // MacOS file type for download const windowsExtension = `.msi` // Windows file type for download @@ -28,45 +26,6 @@ const blacklistedBuilds = [ `dirty_nightly`, ] // This is blacklisted builds for download. For example, file.startsWith('dev') is not allowed. -/** - * Asynchronously fetches branches and their latest commit information from the specified URLs. - * - * @return {Promise} This function does not return anything directly but updates the latestBetaCommitTruncatedSha and latestBetaCommitLink values. - */ -export async function getBranches() { - fetch(branchesLink) - .then(async (response) => { - if (response.ok) { - response.json().then((data) => { - const branches = data.map((branch) => branch) - branches.forEach((branch) => { - fetch(branch.commit.url).then(async (data) => { - if (data.ok) { - data.json().then((data) => { - const truncatedSha = data.sha.slice(0, 7) - const commitLink = data.html_url - if (branch.name.toLowerCase() == betaBranch) { - latestBetaCommitTruncatedSha.value = truncatedSha - latestBetaCommitLink.value = commitLink - } - }) - } else { - throw new Error(data.status) - } - }) - }) - }) - } else { - throw new Error(response.status) - } - }) - .catch((error) => { - latestBetaCommitTruncatedSha.value = error.message - latestBetaCommitLink.value = undefined - console.error(failedFetch[1], error) - }) -} - /** * Asynchronous function to get remote data and handle updates and downloads. * diff --git a/apps/app/tauri.conf.json b/apps/app/tauri.conf.json index f3ab882b..6a83c167 100644 --- a/apps/app/tauri.conf.json +++ b/apps/app/tauri.conf.json @@ -44,7 +44,7 @@ ] }, "productName": "AstralRinth App", - "version": "0.9.305", + "version": "0.9.306", "mainBinaryName": "AstralRinth App", "identifier": "AstralRinthApp", "plugins": { @@ -82,7 +82,7 @@ "capabilities": ["core", "plugins"], "csp": { "default-src": "'self' customprotocol: asset:", - "connect-src": "https://api.github.com ipc: http://ipc.localhost https://modrinth.com https://*.modrinth.com https://*.posthog.com https://*.sentry.io https://api.mclo.gs", + "connect-src": "https://git.astralium.su ipc: http://ipc.localhost https://modrinth.com https://*.modrinth.com https://*.posthog.com https://*.sentry.io https://api.mclo.gs", "font-src": ["https://cdn-raw.modrinth.com/fonts/inter/"], "img-src": "https: 'unsafe-inline' 'self' asset: http://asset.localhost blob: data:", "style-src": "'unsafe-inline' 'self'",