mirror of
https://github.com/Cyrix126/gupaxx.git
synced 2024-12-22 22:59:27 +00:00
use wgpu
backend for Linux
May fix https://www.reddit.com/r/MoneroMining/comments/140jlpy/i_cant_get_gupax_to_work_on_linux_fedora_any_ideas/
This commit is contained in:
parent
858e43dbcf
commit
9ac5335321
3 changed files with 37 additions and 49 deletions
55
.github/workflows/ci.yml
vendored
55
.github/workflows/ci.yml
vendored
|
@ -17,7 +17,6 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [windows-2019, macos-11, ubuntu-20.04]
|
os: [windows-2019, macos-11, ubuntu-20.04]
|
||||||
build: [dev, release]
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
@ -31,7 +30,7 @@ jobs:
|
||||||
path: |
|
path: |
|
||||||
~/.cargo
|
~/.cargo
|
||||||
target
|
target
|
||||||
key: ${{ matrix.os }}-${{ matrix.build }}
|
key: ${{ matrix.os }}
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
|
@ -45,40 +44,44 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- name: Test
|
- name: Test
|
||||||
run: cargo test --all-features --profile ${{ matrix.build }}
|
run: cargo test --all-features --release
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
if [ "$RUNNER_OS" == "macOS" ]; then
|
if [ "$RUNNER_OS" == "macOS" ]; then
|
||||||
cargo bundle --all-features --profile ${{ matrix.build }}
|
cargo bundle --all-features --release
|
||||||
cargo bundle --all-features --profile ${{ matrix.build }} --target aarch64-apple-darwin
|
cargo bundle --all-features --release --target aarch64-apple-darwin
|
||||||
|
elif [ "$RUNNER_OS" == "Linux" ]; then
|
||||||
|
cargo build --all-features --release --target x86_64-unknown-linux-gnu
|
||||||
else
|
else
|
||||||
cargo build --all-features --profile ${{ matrix.build }}
|
cargo build --all-features --release
|
||||||
fi
|
fi
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- name: Archive (Debug)
|
- name: Archive (Windows)
|
||||||
|
if: ${{ runner.os == 'Windows' }}
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: gupax-debug-${{ matrix.os }}
|
name: windows
|
||||||
if: matrix.os == 'windows-2019'
|
path: target/release/gupax.exe
|
||||||
path: target/debug/gupax.exe
|
|
||||||
if: matrix.os == 'macos-11'
|
|
||||||
path: |
|
|
||||||
target/debug/bundle/osx/Gupax.app
|
|
||||||
target/aarch64-apple-darwin/debug/bundle/osx/Gupax.app
|
|
||||||
if: matrix.os == 'ubuntu-20.04'
|
|
||||||
path: target/debug/gupax
|
|
||||||
|
|
||||||
- name: Archive (Release)
|
- name: Archive (macOS-x64)
|
||||||
|
if: ${{ runner.os == 'macOS' }}
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: gupax-release-${{ matrix.os }}
|
name: macos-x64
|
||||||
if: matrix.os == 'windows-2019'
|
path: target/release/bundle/osx/Gupax.app
|
||||||
path: target/release/gupax.exe
|
|
||||||
if: matrix.os == 'macos-11'
|
- name: Archive (macOS-arm64)
|
||||||
path: |
|
if: ${{ runner.os == 'macOS' }}
|
||||||
target/release/bundle/osx/Gupax.app
|
uses: actions/upload-artifact@v3
|
||||||
target/aarch64-apple-darwin/release/bundle/osx/Gupax.app
|
with:
|
||||||
if: matrix.os == 'ubuntu-20.04'
|
name: macos-arm64
|
||||||
path: target/release/gupax
|
path: target/aarch64-apple-darwin/release/bundle/osx/Gupax.app
|
||||||
|
|
||||||
|
- name: Archive (Linux)
|
||||||
|
if: ${{ runner.os == 'Linux' }}
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: linux
|
||||||
|
path: target/x86_64-unknown-linux-gnu/release/gupax
|
||||||
|
|
19
Cargo.lock
generated
19
Cargo.lock
generated
|
@ -1259,9 +1259,7 @@ dependencies = [
|
||||||
"egui",
|
"egui",
|
||||||
"egui-wgpu",
|
"egui-wgpu",
|
||||||
"egui-winit",
|
"egui-winit",
|
||||||
"egui_glow",
|
|
||||||
"getrandom 0.2.8",
|
"getrandom 0.2.8",
|
||||||
"glow",
|
|
||||||
"glutin",
|
"glutin",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
|
@ -1325,21 +1323,6 @@ dependencies = [
|
||||||
"image",
|
"image",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "egui_glow"
|
|
||||||
version = "0.19.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ad77d4a00402bae9658ee64be148f4b2a0b38e4fc7874970575ca01ed1c5b75d"
|
|
||||||
dependencies = [
|
|
||||||
"bytemuck",
|
|
||||||
"egui",
|
|
||||||
"glow",
|
|
||||||
"memoffset 0.6.5",
|
|
||||||
"tracing",
|
|
||||||
"wasm-bindgen",
|
|
||||||
"web-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "either"
|
name = "either"
|
||||||
version = "1.8.1"
|
version = "1.8.1"
|
||||||
|
@ -2068,8 +2051,10 @@ dependencies = [
|
||||||
"image",
|
"image",
|
||||||
"is_elevated",
|
"is_elevated",
|
||||||
"log",
|
"log",
|
||||||
|
"lzma-sys",
|
||||||
"num-format",
|
"num-format",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
|
"openssl",
|
||||||
"portable-pty",
|
"portable-pty",
|
||||||
"rand 0.8.5",
|
"rand 0.8.5",
|
||||||
"regex",
|
"regex",
|
||||||
|
|
12
Cargo.toml
12
Cargo.toml
|
@ -78,10 +78,8 @@ strsim = "0.10.0"
|
||||||
tar = "0.4.38"
|
tar = "0.4.38"
|
||||||
flate2 = "1.0"
|
flate2 = "1.0"
|
||||||
sudo = "0.6.0"
|
sudo = "0.6.0"
|
||||||
## [glow] backend for Unix.
|
|
||||||
eframe = { version = "0.19.0", default-features = false, features = ["glow"] }
|
|
||||||
|
|
||||||
# macOS Tor
|
# macOS
|
||||||
[target.'cfg(target_os = "macos")'.dependencies]
|
[target.'cfg(target_os = "macos")'.dependencies]
|
||||||
# On apple-darwin targets there is an issue with the native and rustls
|
# On apple-darwin targets there is an issue with the native and rustls
|
||||||
# tls implementation so this makes it fall back to the openssl variant.
|
# tls implementation so this makes it fall back to the openssl variant.
|
||||||
|
@ -95,17 +93,19 @@ openssl = { version = "0.10", features = ["vendored"] }
|
||||||
# We don't even use `xz` in `flate2` but this gets dynamically
|
# We don't even use `xz` in `flate2` but this gets dynamically
|
||||||
# linked as well which causes problems, so statically link it.
|
# linked as well which causes problems, so statically link it.
|
||||||
lzma-sys = { version = "0.1.20", features = ["static"] }
|
lzma-sys = { version = "0.1.20", features = ["static"] }
|
||||||
|
## [glow] backend for macOS.
|
||||||
|
eframe = { version = "0.19.0", default-features = false, features = ["glow"] }
|
||||||
|
|
||||||
# Windows/Linux Tor
|
# Windows/Linux
|
||||||
[target.'cfg(not(target_os = "macos"))'.dependencies]
|
[target.'cfg(not(target_os = "macos"))'.dependencies]
|
||||||
tls-api-native-tls = "0.9.0"
|
tls-api-native-tls = "0.9.0"
|
||||||
|
## [wgpu] backend
|
||||||
|
eframe = { version = "0.19.0", default-features = false, features = ["wgpu"] }
|
||||||
|
|
||||||
# Windows dependencies
|
# Windows dependencies
|
||||||
[target.'cfg(windows)'.dependencies]
|
[target.'cfg(windows)'.dependencies]
|
||||||
zip = "0.6.6"
|
zip = "0.6.6"
|
||||||
is_elevated = "0.1.2"
|
is_elevated = "0.1.2"
|
||||||
## [wgpu] backend for Windows.
|
|
||||||
eframe = { version = "0.19.0", default-features = false, features = ["wgpu"] }
|
|
||||||
|
|
||||||
# For Windows build (icon)
|
# For Windows build (icon)
|
||||||
[target.'cfg(windows)'.build-dependencies]
|
[target.'cfg(windows)'.build-dependencies]
|
||||||
|
|
Loading…
Reference in a new issue