Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove orbtk frontend #119

Merged
merged 1 commit into from
Dec 16, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Remove orbtk frontend
qarmin committed Dec 16, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit f6347e313362baa9e641a60a7594974ade33a436
47 changes: 0 additions & 47 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
@@ -169,53 +169,6 @@ jobs:
path: target/release/czkawka_gui
if: ${{ matrix.type == 'release' }}

linux-gui-orbtk:
strategy:
matrix:
toolchain: [ stable ]
type: [ release ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.toolchain }}
override: true

- uses: actions/cache@v2
with:
path: |
target
key: linux-gui-orbtk-${{github.ref}}-${{github.sha}}
restore-keys: |
linux-gui-orbtk-${{github.ref}}-${{github.sha}}
- name: Install basic libraries
run: sudo apt-get update; sudo apt install libgtk-3-dev -y

- name: Build GUI Orbtk Debug
run: cargo build --bin czkawka_gui_orbtk
env:
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-C debuginfo=0 -D warnings"
if: ${{ matrix.type == 'debug'}}

- name: Build GUI Orbtk Release
run: cargo build --release --bin czkawka_gui_orbtk
env:
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-C debuginfo=0 -D warnings"
if: ${{ matrix.type == 'release'}}

- name: Store Linux GUI Orbtk
uses: actions/upload-artifact@v2
with:
name: czkawka_gui_orbtk-${{ runner.os }}-${{ matrix.toolchain }}
path: target/release/czkawka_gui_orbtk
if: ${{ matrix.type == 'release' }}


linux-appimage-gui:
strategy:
matrix:
44 changes: 0 additions & 44 deletions .github/workflows/mac.yml
Original file line number Diff line number Diff line change
@@ -47,47 +47,3 @@ jobs:
name: czkawka_cli-${{ runner.os }}-${{ matrix.toolchain }}
path: target/release/czkawka_cli
if: ${{ matrix.type == 'release' }}


macos-gui-orbtk:
strategy:
matrix:
toolchain: [ stable ]
type: [ release ]
runs-on: macos-latest
steps:
- uses: actions/checkout@v2

- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.toolchain }}
override: true

- uses: actions/cache@v2
with:
path: |
target
key: macos-gui-orbtk-${{github.ref}}-${{github.sha}}
restore-keys: |
macos-gui-orbtk-${{github.ref}}-${{github.sha}}
- name: Build GUI Orbtk Debug
run: cargo build --bin czkawka_gui_orbtk
env:
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-C debuginfo=0 -D warnings"
if: ${{ matrix.type == 'debug'}}

- name: Build GUI Orbtk Release
run: cargo build --release --bin czkawka_gui_orbtk
env:
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-C debuginfo=0 -D warnings"
if: ${{ matrix.type == 'release'}}

- name: Store MacOS GUI Orbtk
uses: actions/upload-artifact@v2
with:
name: czkawka_gui_orbtk-${{ runner.os }}-${{ matrix.toolchain }}
path: target/release/czkawka_gui_orbtk
if: ${{ matrix.type == 'release' }}
45 changes: 0 additions & 45 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -144,51 +144,6 @@ jobs:
python misc/check_results.py TestSuite 14 8
if: ${{ matrix.type == 'release' }}


windows-gui-orbtk:
strategy:
matrix:
toolchain: [ stable ]
type: [ release ]
runs-on: windows-latest
steps:
- uses: actions/checkout@v2

- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.toolchain }}
override: true

- uses: actions/cache@v2
with:
path: |
target
key: windows-gui-orbtk-${{github.ref}}-${{github.sha}}
restore-keys: |
windows-gui-orbtk-${{github.ref}}-${{github.sha}}
- name: Build GUI Orbtk Debug
run: cargo build --bin czkawka_gui_orbtk
env:
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-C debuginfo=0 -D warnings"
if: ${{ matrix.type == 'debug'}}

- name: Build GUI Orbtk Release
run: cargo build --release --bin czkawka_gui_orbtk
env:
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-C debuginfo=0 -D warnings"
if: ${{ matrix.type == 'release'}}

- name: Store Windows GUI Orbtk
uses: actions/upload-artifact@v2
with:
name: czkawka_gui_orbtk-${{ runner.os }}-${{ matrix.toolchain }}
path: target/release/czkawka_gui_orbtk.exe
if: ${{ matrix.type == 'release' }}


windows-gui:
strategy:
matrix:
1,173 changes: 57 additions & 1,116 deletions Cargo.lock

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@ members = [
"czkawka_core",
"czkawka_cli",
"czkawka_gui",
"czkawka_gui_orbtk",
]
#[profile.release]
#lto = true
8 changes: 1 addition & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ Sadly some features are not available like mounted drives
sudo snap install czkawka
```

## Flatpak
### Flatpak
Maybe someday


@@ -113,12 +113,6 @@ cargo run --bin czkawka_gui
```
For Linux-to-Windows cross-building instruction look at the CI.
![GUI GTK](https://user-images.githubusercontent.com/41945903/94850801-c5945380-0427-11eb-8d4c-af4946ab02d5.png)
- Run alternative Orbtk GUI (Still WIP, currently stopped due https://github.com/intellij-rust/intellij-rust/issues/5943)

```
cargo run --bin czkawka_gui_orbtk
```
![GUI Orbtk](https://user-images.githubusercontent.com/41945903/92405241-7b27fb80-f135-11ea-9fc4-5ebc2b76b011.png)
- Run CLI(this will print help with a lot of examples)
```
cargo run --bin czkawka_cli
14 changes: 0 additions & 14 deletions czkawka_gui_orbtk/Cargo.toml

This file was deleted.

53 changes: 0 additions & 53 deletions czkawka_gui_orbtk/src/main.rs

This file was deleted.

14 changes: 0 additions & 14 deletions misc/cargo/PublishOther.sh
Original file line number Diff line number Diff line change
@@ -31,15 +31,6 @@ then
fi
git reset --hard

cd "$CZKAWKA_PATH/czkawka_gui_orbtk"
sed -i "s/{ path = \"..\/czkawka_core\" }/\"=$NUMBER\"/g" "$CZKAWKA_PATH/czkawka_gui_orbtk/Cargo.toml"
cargo package --allow-dirty
if [ $(echo $?) != "0" ]
then
echo "Cargo package failed GUI ORBTK"
exit 1
fi
git reset --hard



@@ -52,8 +43,3 @@ cd "$CZKAWKA_PATH/czkawka_gui"
sed -i "s/{ path = \"..\/czkawka_core\" }/\"=$NUMBER\"/g" "$CZKAWKA_PATH/czkawka_gui/Cargo.toml"
cargo publish --allow-dirty
git reset --hard

cd "$CZKAWKA_PATH/czkawka_gui_orbtk"
sed -i "s/{ path = \"..\/czkawka_core\" }/\"=$NUMBER\"/g" "$CZKAWKA_PATH/czkawka_gui_orbtk/Cargo.toml"
cargo publish --allow-dirty
git reset --hard