mirror of
https://github.com/wez/wezterm.git
synced 2024-12-23 21:32:13 +03:00
ci: make fix tumbleweed build
This commit is contained in:
parent
fc481106af
commit
7b6aad6884
@ -65,6 +65,9 @@ jobs:
|
||||
~/.cargo/git
|
||||
target
|
||||
key: "opensuse_tumbleweed-None-2-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
|
||||
- name: "Remove problematic deps"
|
||||
shell: bash
|
||||
run: "zypper remove -y busybox-which || true"
|
||||
- name: "Install System Deps"
|
||||
shell: bash
|
||||
run: "env PATH=$PATH ./get-deps"
|
||||
|
@ -69,6 +69,9 @@ jobs:
|
||||
~/.cargo/git
|
||||
target
|
||||
key: "opensuse_tumbleweed-None-2-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
|
||||
- name: "Remove problematic deps"
|
||||
shell: bash
|
||||
run: "zypper remove -y busybox-which || true"
|
||||
- name: "Install System Deps"
|
||||
shell: bash
|
||||
run: "env PATH=$PATH ./get-deps"
|
||||
|
@ -53,6 +53,9 @@ jobs:
|
||||
~/.cargo/git
|
||||
target
|
||||
key: "opensuse_tumbleweed-None-2-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}-cargo"
|
||||
- name: "Remove problematic deps"
|
||||
shell: bash
|
||||
run: "zypper remove -y busybox-which || true"
|
||||
- name: "Install System Deps"
|
||||
shell: bash
|
||||
run: "env PATH=$PATH ./get-deps"
|
||||
|
@ -317,10 +317,20 @@ ln -s /usr/local/git/bin/git /usr/local/bin/git""",
|
||||
def install_system_deps(self):
|
||||
if "win" in self.name:
|
||||
return []
|
||||
steps = []
|
||||
sudo = "sudo -n " if self.needs_sudo() else ""
|
||||
return [
|
||||
if "tumbleweed" in self.name:
|
||||
# get-deps wants to install rpmbuild. rpmbuild depends on which, but
|
||||
# installation is blocked because the image already has busybox-which
|
||||
# installed. Solution: uninstall busybox-which and allow rpmbuild to
|
||||
# satisfy its dependency
|
||||
steps += [
|
||||
RunStep(name="Remove problematic deps", run=f"{sudo}zypper remove -y busybox-which || true")
|
||||
]
|
||||
steps += [
|
||||
RunStep(name="Install System Deps", run=f"{sudo}env PATH=$PATH ./get-deps")
|
||||
]
|
||||
return steps
|
||||
|
||||
def build_all_release(self):
|
||||
if "win" in self.name:
|
||||
|
Loading…
Reference in New Issue
Block a user