Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[target.aarch64-pc-windows-msvc]
linker = "rust-lld"

# Windows has stack overflows when calling from Tauri, so we increase the default stack size used by the compiler
[target."cfg(windows)"]
rustflags = ["-C", "link-args=/STACK:16777220"]
Expand Down
16 changes: 13 additions & 3 deletions .github/scripts/notify-app-build.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,29 @@ const {
const PLATFORMS = [
{
label: 'Windows',
job: 'Build (namespace-profile-modrinth-app-windows)',
job: 'Build (x86_64-pc-windows-msvc)',
artifact: 'App bundle (x86_64-pc-windows-msvc)',
},
{
label: 'Windows ARM',
job: 'Build (aarch64-pc-windows-msvc)',
artifact: 'App bundle (aarch64-pc-windows-msvc)',
},
{
label: 'MacOS',
job: 'Build (namespace-profile-modrinth-app-macos)',
job: 'Build (universal-apple-darwin)',
artifact: 'App bundle (universal-apple-darwin)',
},
{
label: 'Linux',
job: 'Build (namespace-profile-modrinth-app-linux)',
job: 'Build (x86_64-unknown-linux-gnu)',
artifact: 'App bundle (x86_64-unknown-linux-gnu)',
},
{
label: 'Linux ARM',
job: 'Build (aarch64-unknown-linux-gnu)',
artifact: 'App bundle (aarch64-unknown-linux-gnu)',
},
]

const runUrl = `${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}`
Expand Down
23 changes: 14 additions & 9 deletions .github/workflows/theseus-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,26 +50,27 @@ env:

jobs:
build:
name: Build
name: Build (${{ matrix.artifact-target-name }})
env:
VITE_STRIPE_PUBLISHABLE_KEY: pk_live_51JbFxJJygY5LJFfKLVVldb10HlLt24p421OWRsTOWc5sXYFOnFUXWieSc6HD3PHo25ktx8db1WcHr36XGFvZFVUz00V9ixrCs5
RUSTC_WRAPPER: 'sccache'
strategy:
fail-fast: false
matrix:
platform:
[
namespace-profile-modrinth-app-macos,
namespace-profile-modrinth-app-windows,
namespace-profile-modrinth-app-linux,
]
include:
- platform: namespace-profile-modrinth-app-macos
artifact-target-name: universal-apple-darwin
rust-target: x86_64-apple-darwin
- platform: namespace-profile-modrinth-app-windows
artifact-target-name: x86_64-pc-windows-msvc
- platform: namespace-profile-modrinth-app-windows-arm64
artifact-target-name: aarch64-pc-windows-msvc
rust-target: aarch64-pc-windows-msvc
tauri-target-args: --target aarch64-pc-windows-msvc
- platform: namespace-profile-modrinth-app-linux
artifact-target-name: x86_64-unknown-linux-gnu
- platform: namespace-profile-modrinth-app-linux-arm64
artifact-target-name: aarch64-unknown-linux-gnu

runs-on: ${{ matrix.platform }}

Expand All @@ -84,7 +85,8 @@ jobs:
with:
rustflags: ''
build-warnings: ''
target: ${{ contains(matrix.artifact-target-name, 'darwin') && 'x86_64-apple-darwin' || '' }}
target: ${{ matrix.rust-target }}
cache: false

- name: Setup mold
if: contains(matrix.artifact-target-name, 'linux')
Expand Down Expand Up @@ -216,7 +218,7 @@ jobs:
[System.Convert]::FromBase64String("$env:DIGICERT_ONE_SIGNER_CLIENT_CERTIFICATE_BASE64") | Set-Content -Path signer-client-cert.p12 -AsByteStream
$env:DIGICERT_ONE_SIGNER_CREDENTIALS = "$env:DIGICERT_ONE_SIGNER_API_KEY|$PWD\signer-client-cert.p12|$env:DIGICERT_ONE_SIGNER_CLIENT_CERTIFICATE_PASSWORD"
$env:JAVA_HOME = "$env:JAVA_HOME_17_X64"
${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || inputs.app-version-override != '') && 'pnpm --filter=@modrinth/app run tauri build --config tauri-release.conf.json --verbose --bundles "nsis,updater"' || 'pnpm --filter=@modrinth/app run tauri build --config tauri-dev.conf.json --verbose --bundles "nsis,updater" ''--'' --profile release-with-thin-lto' }}
${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || inputs.app-version-override != '') && format('pnpm --filter=@modrinth/app run tauri build {0} --config tauri-release.conf.json --verbose --bundles "nsis,updater"', matrix.tauri-target-args) || format('pnpm --filter=@modrinth/app run tauri build {0} --config tauri-dev.conf.json --verbose --bundles "nsis,updater" ''--'' --profile release-with-thin-lto', matrix.tauri-target-args) }}
Remove-Item -Path signer-client-cert.p12 -ErrorAction SilentlyContinue
if: contains(matrix.artifact-target-name, 'windows')
env:
Expand Down Expand Up @@ -244,6 +246,9 @@ jobs:
target/release/bundle/nsis/Modrinth App_*-setup.exe*
target/release-with-thin-lto/bundle/nsis/Modrinth App (dev-*)_*-setup.exe*
target/release/bundle/nsis/Modrinth App_*-setup.nsis.zip*
target/aarch64-pc-windows-msvc/release/bundle/nsis/Modrinth App_*-setup.exe*
target/aarch64-pc-windows-msvc/release-with-thin-lto/bundle/nsis/Modrinth App (dev-*)_*-setup.exe*
target/aarch64-pc-windows-msvc/release/bundle/nsis/Modrinth App_*-setup.nsis.zip*

- name: Remove bundles from cached target directory
if: always()
Expand Down
30 changes: 29 additions & 1 deletion .github/workflows/theseus-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ jobs:
env:
VERSION_TAG: ${{ github.event.workflow_run.head_branch }}
LINUX_X64_BUNDLE_ARTIFACT_NAME: App bundle (x86_64-unknown-linux-gnu)
LINUX_ARM64_BUNDLE_ARTIFACT_NAME: App bundle (aarch64-unknown-linux-gnu)
WINDOWS_X64_BUNDLE_ARTIFACT_NAME: App bundle (x86_64-pc-windows-msvc)
WINDOWS_ARM64_BUNDLE_ARTIFACT_NAME: App bundle (aarch64-pc-windows-msvc)
MACOS_UNIVERSAL_BUNDLE_ARTIFACT_NAME: App bundle (universal-apple-darwin)
LAUNCHER_FILES_BUCKET_BASE_URL: https://launcher-files.modrinth.com

Expand Down Expand Up @@ -72,7 +74,9 @@ jobs:
--rawfile macOsAarch64UpdateArtifactSignature "${MACOS_UNIVERSAL_BUNDLE_ARTIFACT_NAME}/universal-apple-darwin/release/bundle/macos/Modrinth App.app.tar.gz.sig" \
--rawfile macOsX64UpdateArtifactSignature "${MACOS_UNIVERSAL_BUNDLE_ARTIFACT_NAME}/universal-apple-darwin/release/bundle/macos/Modrinth App.app.tar.gz.sig" \
--rawfile linuxX64UpdateArtifactSignature "${LINUX_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/appimage/Modrinth App_${VERSION_TAG#v}_amd64.AppImage.tar.gz.sig" \
--rawfile linuxArm64UpdateArtifactSignature "${LINUX_ARM64_BUNDLE_ARTIFACT_NAME}/release/bundle/appimage/Modrinth App_${VERSION_TAG#v}_aarch64.AppImage.tar.gz.sig" \
--rawfile windowsX64UpdateArtifactSignature "${WINDOWS_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/nsis/Modrinth App_${VERSION_TAG#v}_x64-setup.nsis.zip.sig" \
--rawfile windowsArm64UpdateArtifactSignature "${WINDOWS_ARM64_BUNDLE_ARTIFACT_NAME}/aarch64-pc-windows-msvc/release/bundle/nsis/Modrinth App_${VERSION_TAG#v}_arm64-setup.nsis.zip.sig" \
'{
"version": $versionTag,
"notes": $releaseNotes,
Expand All @@ -97,10 +101,24 @@ jobs:
@uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/linux/\("Modrinth App-" + $versionTag + "-1.x86_64.rpm")"
]
},
"linux-aarch64": {
"signature": $linuxArm64UpdateArtifactSignature,
"url": @uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/linux/\("Modrinth App_" + $versionTag + "_aarch64.AppImage.tar.gz")",
"install_urls": [
@uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/linux/\("Modrinth App_" + $versionTag + "_arm64.deb")",
@uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/linux/\("Modrinth App_" + $versionTag + "_aarch64.AppImage")",
@uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/linux/\("Modrinth App-" + $versionTag + "-1.aarch64.rpm")"
]
},
"windows-x86_64": {
"signature": $windowsX64UpdateArtifactSignature,
"url": @uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/windows/\("Modrinth App_" + $versionTag + "_x64-setup.nsis.zip")",
"install_urls": [@uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/windows/\("Modrinth App_" + $versionTag + "_x64-setup.exe")"]
},
"windows-aarch64": {
"signature": $windowsArm64UpdateArtifactSignature,
"url": @uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/windows/\("Modrinth App_" + $versionTag + "_arm64-setup.nsis.zip")",
"install_urls": [@uri "${{ env.LAUNCHER_FILES_BUCKET_BASE_URL }}/versions/\($versionTag)/windows/\("Modrinth App_" + $versionTag + "_arm64-setup.exe")"]
}
}
}' > updates.json
Expand Down Expand Up @@ -133,12 +151,18 @@ jobs:
aws s3 cp --recursive \
"${LINUX_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/${linuxBundleType}" \
"s3://${AWS_BUCKET}/versions/${VERSION_TAG#v}/linux"
aws s3 cp --recursive \
"${LINUX_ARM64_BUNDLE_ARTIFACT_NAME}/release/bundle/${linuxBundleType}" \
"s3://${AWS_BUCKET}/versions/${VERSION_TAG#v}/linux"
done

for windowsBundleType in 'nsis'; do
aws s3 cp --recursive \
"${WINDOWS_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/${windowsBundleType}" \
"s3://${AWS_BUCKET}/versions/${VERSION_TAG#v}/windows"
aws s3 cp --recursive \
"${WINDOWS_ARM64_BUNDLE_ARTIFACT_NAME}/aarch64-pc-windows-msvc/release/bundle/${windowsBundleType}" \
"s3://${AWS_BUCKET}/versions/${VERSION_TAG#v}/windows"
done

aws s3 cp updates.json "s3://${AWS_BUCKET}"
Expand All @@ -153,7 +177,11 @@ jobs:
--title "Modrinth App ${VERSION}" \
--notes-file release-notes.md \
"${WINDOWS_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/nsis/Modrinth App_${VERSION}_x64-setup.exe" \
"${WINDOWS_ARM64_BUNDLE_ARTIFACT_NAME}/aarch64-pc-windows-msvc/release/bundle/nsis/Modrinth App_${VERSION}_arm64-setup.exe" \
"${MACOS_UNIVERSAL_BUNDLE_ARTIFACT_NAME}/universal-apple-darwin/release/bundle/dmg/Modrinth App_${VERSION}_universal.dmg" \
"${LINUX_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/appimage/Modrinth App_${VERSION}_amd64.AppImage" \
"${LINUX_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/deb/Modrinth App_${VERSION}_amd64.deb" \
"${LINUX_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/rpm/Modrinth App-${VERSION}-1.x86_64.rpm"
"${LINUX_X64_BUNDLE_ARTIFACT_NAME}/release/bundle/rpm/Modrinth App-${VERSION}-1.x86_64.rpm" \
"${LINUX_ARM64_BUNDLE_ARTIFACT_NAME}/release/bundle/appimage/Modrinth App_${VERSION}_aarch64.AppImage" \
"${LINUX_ARM64_BUNDLE_ARTIFACT_NAME}/release/bundle/deb/Modrinth App_${VERSION}_arm64.deb" \
"${LINUX_ARM64_BUNDLE_ARTIFACT_NAME}/release/bundle/rpm/Modrinth App-${VERSION}-1.aarch64.rpm"
1 change: 1 addition & 0 deletions Cargo.lock

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

9 changes: 9 additions & 0 deletions apps/frontend/src/locales/en-US/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -548,15 +548,24 @@
"app-marketing.download.download-appimage": {
"message": "Download the AppImage"
},
"app-marketing.download.download-appimage-arm64": {
"message": "Download the AppImage (ARM64)"
},
"app-marketing.download.download-beta": {
"message": "Download the beta"
},
"app-marketing.download.download-deb": {
"message": "Download the DEB"
},
"app-marketing.download.download-deb-arm64": {
"message": "Download the DEB (ARM64)"
},
"app-marketing.download.download-rpm": {
"message": "Download the RPM"
},
"app-marketing.download.download-rpm-arm64": {
"message": "Download the RPM (ARM64)"
},
"app-marketing.download.flathub": {
"message": "Get it on Flathub"
},
Expand Down
62 changes: 62 additions & 0 deletions apps/frontend/src/pages/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ interface LauncherUpdates {
platforms: {
'darwin-aarch64': LauncherPlatform
'windows-x86_64': LauncherPlatform
'windows-aarch64'?: LauncherPlatform
'linux-x86_64': LauncherPlatform
'linux-aarch64'?: LauncherPlatform
}
}

Expand All @@ -52,6 +54,7 @@ const downloadWindows = ref<HTMLAnchorElement | null>(null)
const downloadMac = ref<HTMLAnchorElement | null>(null)
const downloadSection = ref<HTMLElement | null>(null)
const windowsLink = ref<string | null>(null)
const windowsArm64Link = ref<string | null>(null)

const linuxLinks = reactive({
appImage: null as string | null,
Expand All @@ -60,6 +63,12 @@ const linuxLinks = reactive({
thirdParty: 'https://support.modrinth.com/en/articles/9298760',
})

const linuxArm64Links = reactive({
appImage: null as string | null,
deb: null as string | null,
rpm: null as string | null,
})

const macLinks = reactive({
universal: null as string | null,
})
Expand Down Expand Up @@ -218,9 +227,13 @@ watch(
if (newData?.platforms) {
macLinks.universal = newData.platforms['darwin-aarch64']?.install_urls[0] || null
windowsLink.value = newData.platforms['windows-x86_64']?.install_urls[0] || null
windowsArm64Link.value = newData.platforms['windows-aarch64']?.install_urls[0] || null
linuxLinks.appImage = newData.platforms['linux-x86_64']?.install_urls[1] || null
linuxLinks.deb = newData.platforms['linux-x86_64']?.install_urls[0] || null
linuxLinks.rpm = newData.platforms['linux-x86_64']?.install_urls[2] || null
linuxArm64Links.appImage = newData.platforms['linux-aarch64']?.install_urls[1] || null
linuxArm64Links.deb = newData.platforms['linux-aarch64']?.install_urls[0] || null
linuxArm64Links.rpm = newData.platforms['linux-aarch64']?.install_urls[2] || null
}
},
{ immediate: true },
Expand Down Expand Up @@ -475,6 +488,18 @@ const messages = defineMessages({
id: 'app-marketing.download.download-rpm',
defaultMessage: 'Download the RPM',
},
downloadTheAppImageArm64: {
id: 'app-marketing.download.download-appimage-arm64',
defaultMessage: 'Download the AppImage (ARM64)',
},
downloadTheDEBArm64: {
id: 'app-marketing.download.download-deb-arm64',
defaultMessage: 'Download the DEB (ARM64)',
},
downloadTheRPMArm64: {
id: 'app-marketing.download.download-rpm-arm64',
defaultMessage: 'Download the RPM (ARM64)',
},
downloadTerms: {
id: 'app-marketing.download.terms',
defaultMessage:
Expand Down Expand Up @@ -1011,6 +1036,16 @@ useSeoMeta({
<DownloadIcon />
<span>{{ formatMessage(messages.downloadTheBeta) }}</span>
</a>
<div v-if="windowsArm64Link" class="mt-2 flex items-center gap-4 text-sm text-primary">
<a :href="windowsLink || undefined" download="">
<DownloadIcon />
<span>x64</span>
</a>
<a :href="windowsArm64Link" download="">
<DownloadIcon />
<span>ARM64</span>
</a>
</div>
</div>
</div>
<div class="divider" />
Expand Down Expand Up @@ -1097,6 +1132,33 @@ useSeoMeta({
<DownloadIcon />
<span>{{ formatMessage(messages.downloadTheRPM) }}</span>
</a>
<a
v-if="linuxArm64Links.appImage"
:href="linuxArm64Links.appImage"
download=""
class="text-primary"
>
<DownloadIcon />
<span>{{ formatMessage(messages.downloadTheAppImageArm64) }}</span>
</a>
<a
v-if="linuxArm64Links.deb"
:href="linuxArm64Links.deb"
download=""
class="text-primary"
>
<DownloadIcon />
<span>{{ formatMessage(messages.downloadTheDEBArm64) }}</span>
</a>
<a
v-if="linuxArm64Links.rpm"
:href="linuxArm64Links.rpm"
download=""
class="text-primary"
>
<DownloadIcon />
<span>{{ formatMessage(messages.downloadTheRPMArm64) }}</span>
</a>
</Accordion>
</div>
</div>
Expand Down
Loading
Loading