diff --git a/.github/workflows/build-base.yml b/.github/workflows/build-base.yml index ac4087c86a..01901b1793 100644 --- a/.github/workflows/build-base.yml +++ b/.github/workflows/build-base.yml @@ -40,18 +40,25 @@ jobs: SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.snapcraftIdEdge }} if: runner.os == 'Linux' && inputs.publish-snap - name: Build AppImage version - run: pnpm dist:linux AppImage --publish=never + run: pnpm dist:linux AppImage --x64 --arm64 --publish=never if: runner.os == 'Linux' - name: Upload built version uses: actions/upload-artifact@v3 with: name: ${{ (matrix.os == 'windows-2022' && 'win-portable' ) || (matrix.os == 'macos-12' && 'mac-x64' ) || - (matrix.os == 'ubuntu-22.04' && 'linux-AppImage') }} + (matrix.os == 'ubuntu-22.04' && 'linux-AppImage-x64') }} path: ${{ (matrix.os == 'windows-2022' && 'dist/Heroic*.exe' ) || (matrix.os == 'macos-12' && 'dist/Heroic*x64.dmg' ) || - (matrix.os == 'ubuntu-22.04' && 'dist/Heroic-*.AppImage') }} + (matrix.os == 'ubuntu-22.04' && 'dist/Heroic*x86_64.AppImage') }} retention-days: 14 + - name: Upload linux ARM version + uses: actions/upload-artifact@v3 + with: + name: linux-AppImage-arm64 + path: dist/Heroic*arm64.AppImage + retention-days: 14 + if: runner.os == 'Linux' - name: Upload macOS ARM version uses: actions/upload-artifact@v3 with: diff --git a/electron-builder.yml b/electron-builder.yml index a02b0f8959..0eb1979410 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -59,12 +59,13 @@ dmg: path: /Applications linux: + artifactName: ${productName}-${version}-linux-${arch}.${ext} category: Game icon: build/icon.icns - description: An Open Source Launcher for GOG and Epic Games desktop: Name: Heroic Games Launcher - Comment[de]: Ein Open Source Spielelauncher for GOG und Epic Games + Comment[de]: Ein OSS-Spielelauncher für GOG, Epic Games und Amazon Games + Comment[pl]: Otwartoźródłowy launcher dla GOG, Epic Games i Amazon Games files: - build/bin/*/linux/* - build/bin/x64/win32/GalaxyCommunication.exe diff --git a/flatpak/com.heroicgameslauncher.hgl.desktop b/flatpak/com.heroicgameslauncher.hgl.desktop index 6515fd07b8..3a89f8c7f1 100644 --- a/flatpak/com.heroicgameslauncher.hgl.desktop +++ b/flatpak/com.heroicgameslauncher.hgl.desktop @@ -5,7 +5,8 @@ Terminal=false Type=Application Icon=com.heroicgameslauncher.hgl StartupWMClass=Heroic -Comment=An Open Source GOG and Epic Games launcher -Comment[de]=Ein Open Source Spielelauncher for GOG und Epic Games +Comment=An Open Source Launcher for GOG, Epic Games and Amazon Games +Comment[de]=Ein OSS-Spielelauncher für GOG, Epic Games und Amazon Games +Comment[pl]=Otwartoźródłowy launcher dla GOG, Epic Games i Amazon Games MimeType=x-scheme-handler/heroic; Categories=Game; diff --git a/flatpak/prepareFlatpak.js b/flatpak/prepareFlatpak.js index 64134d95dd..423d085922 100755 --- a/flatpak/prepareFlatpak.js +++ b/flatpak/prepareFlatpak.js @@ -14,7 +14,7 @@ async function main() { let releaseTime = "" if (process.argv[2] === "release") { const { data } = await axios.get("https://api.github.com/repos/Heroic-Games-Launcher/HeroicGamesLauncher/releases/latest") - const appimage = data.assets.find((asset) => asset.browser_download_url.includes(".AppImage")) + const appimage = data.assets.find((asset) => asset.browser_download_url.includes("x86_64.AppImage")) const outputFile = `${os.tmpdir()}/Heroic.AppImage` child_process.spawnSync("curl", ["-L", appimage.browser_download_url, "-o", outputFile, "--create-dirs"]) const outputContent = fs.readFileSync(outputFile) @@ -32,7 +32,7 @@ async function main() { } else { placeholder = [ "type: file", - `path: "../dist/Heroic-${package.version}.AppImage"` + `path: "../dist/Heroic-${package.version}-linux-x86_64.AppImage"` ].join("\n ") releaseTime = new Date().toISOString().split('T')[0] } diff --git a/meta/downloadHelperBinaries.ts b/meta/downloadHelperBinaries.ts index be4d6c36fc..54a042f037 100644 --- a/meta/downloadHelperBinaries.ts +++ b/meta/downloadHelperBinaries.ts @@ -162,7 +162,8 @@ async function downloadComet() { win32: 'comet-x86_64-pc-windows-msvc.exe' }, arm64: { - darwin: 'comet-aarch64-apple-darwin' + darwin: 'comet-aarch64-apple-darwin', + linux: 'comet-aarch64-unknown-linux-gnu' } }) ]) diff --git a/public/bin/arm64/linux/vulkan-helper b/public/bin/arm64/linux/vulkan-helper new file mode 100755 index 0000000000..0753882fe6 Binary files /dev/null and b/public/bin/arm64/linux/vulkan-helper differ