Skip to content

Commit da64d50

Browse files
committed
fix workflow os for linux
1 parent 45af2c1 commit da64d50

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
build: [linux, windows, mac]
1818
include:
1919
- build: linux
20-
os: buildjet-8vcpu-ubuntu-2204
20+
os: ubuntu-latest
2121
rust: "stable"
2222
- build: windows
2323
os: windows-latest
@@ -29,6 +29,13 @@ jobs:
2929

3030
steps:
3131
- uses: actions/checkout@v4
32+
- name: Install packages (Linux)
33+
if: runner.os == 'Linux'
34+
uses: awalsh128/cache-apt-pkgs-action@v1.4.3
35+
with:
36+
packages: libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev libgtk-3-dev # libgtk-3-dev is used by rfd
37+
version: 1.0
38+
execute_install_scripts: true
3239
- name: Install Rust
3340
uses: dtolnay/rust-toolchain@stable
3441
with:
@@ -41,5 +48,6 @@ jobs:
4148
- name: Upload a Build Artifact
4249
uses: actions/upload-artifact@v4
4350
with:
44-
name: CI builds
45-
path: target/**/ornithe-installer-rs
51+
name: CI builds (${{ matrix.build }})
52+
path: |
53+
target/**/ornithe-installer-rs*

src/actions/mmc_pack.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ pub async fn install(
6868
zip.start_file("instance.cfg", SimpleFileOptions::default())?;
6969
let mut instance_cfg = INSTANCE_CONFIG.replace("${mc_version}", &version.id);
7070

71-
#[cfg(any(unix))]
72-
{
71+
if cfg!(all(any(unix), not(target_os = "macos"))) {
7372
instance_cfg += "\nOverrideCommands=true\nWrapperCommand=env __GL_THREADED_OPTIMIZATIONS=0";
7473
}
7574

0 commit comments

Comments
 (0)