wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-23 13:21:38 +03:00
Code Issues Projects Releases Wiki Activity

ci: make fix tumbleweed build

Browse Source
This commit is contained in:
Wez Furlong 2022-12-31 22:38:59 -07:00
parent fc481106af
commit 7b6aad6884
No known key found for this signature in database
GPG Key ID: 7A7F66A31EC9B387
4 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/gen_opensuse_tumbleweed.yml vendored
View File

@ -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"

3
.github/workflows/gen_opensuse_tumbleweed_continuous.yml vendored
View File

@ -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"

3
.github/workflows/gen_opensuse_tumbleweed_tag.yml vendored
View File

@ -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"

12
ci/generate-workflows.py
View File

@ -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: