Skip to content

Commit

Permalink
Merge pull request #1345 from mintlayer/fix/revert_rfd
Browse files Browse the repository at this point in the history
Revert "Merge pull request #1310 from mintlayer/fix/remove_gtk3"
  • Loading branch information
TheQuantumPhysicist committed Nov 6, 2023
2 parents a0a53e5 + 19f5007 commit 268104f
Show file tree
Hide file tree
Showing 9 changed files with 206 additions and 582 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
concurrent_skipping: "same_content_newer"
skip_after_successful_duplicate: "true"
- name: Install dependencies
run: sudo apt-get install -yqq --no-install-recommends build-essential python3 python3-toml podman
run: sudo apt-get install -yqq --no-install-recommends build-essential libgtk-3-dev python3 python3-toml podman
- uses: actions/checkout@v2
- name: Install rust stable
uses: actions-rs/toolchain@v1
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
concurrent_skipping: "same_content_newer"
skip_after_successful_duplicate: "true"
- name: Install dependencies
run: sudo apt-get install -yqq --no-install-recommends build-essential python3 python3-toml podman
run: sudo apt-get install -yqq --no-install-recommends build-essential libgtk-3-dev python3 python3-toml podman
- uses: actions/checkout@v2
- name: Install rust stable
uses: actions-rs/toolchain@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
concurrent_skipping: "same_content_newer"
skip_after_successful_duplicate: "true"
- name: Install dependencies
run: sudo apt-get install -yqq --no-install-recommends build-essential python3 python3-toml
run: sudo apt-get install -yqq --no-install-recommends build-essential libgtk-3-dev python3 python3-toml
- uses: actions/checkout@v1
- run: rustup component add clippy

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:

steps:
- name: Install dependencies
run: sudo apt-get install -yqq --no-install-recommends build-essential python3 python3-toml
run: sudo apt-get install -yqq --no-install-recommends build-essential libgtk-3-dev python3 python3-toml
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-10-15
toolchain: nightly-2023-08-01
override: true
- uses: actions-rs/cargo@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ workflow:

before_script:
- apt-get update -yqq
- apt-get install -yqq --no-install-recommends build-essential python3 python3-toml podman
- apt-get install -yqq --no-install-recommends build-essential libgtk-3-dev python3 python3-toml podman

build:clean:
stage: build_clean
Expand Down
Loading

0 comments on commit 268104f

Please sign in to comment.