Skip to content

Commit

Permalink
Merge pull request #8 from mbwilding/gui
Browse files Browse the repository at this point in the history
GUI
  • Loading branch information
mbwilding authored Dec 17, 2023
2 parents 485b069 + c0b3872 commit 6d271ae
Show file tree
Hide file tree
Showing 28 changed files with 1,021 additions and 743 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/Release-Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
target: ["x86_64-pc-windows-gnu"] # Waiting for `aarch64-pc-windows-gnu` to be available.
target: ["x86_64-pc-windows-gnu"]

steps:
- name: "Checkout"
Expand All @@ -31,10 +31,10 @@ jobs:
- name: "Zip"
run: |
cp target/${{ matrix.target }}/release/dygma-layer-switcher.exe .
zip windows-${{ github.ref_name }}-${{ matrix.target }}.zip readme.md dygma-layer-switcher.exe assets/icons/icon.ico
zip dls-${{ github.ref_name }}-${{ matrix.target }}.zip dygma-layer-switcher.exe
- name: "Release"
uses: softprops/action-gh-release@v1
with:
files: |
windows-${{ github.ref_name }}-${{ matrix.target }}.zip
dls-${{ github.ref_name }}-${{ matrix.target }}.zip
51 changes: 6 additions & 45 deletions .github/workflows/Validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ env:
APT_PACKAGES: libatk1.0-dev libpango1.0-dev libgtk-3-dev libudev-dev libxdo-dev

jobs:
formatting:
name: "Format"
checks:
name: "Checks"
runs-on: ubuntu-latest

steps:
Expand All @@ -22,52 +22,13 @@ jobs:
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
components: rustfmt

- name: "Format"
run: cargo fmt -- --check

clippy:
name: "Clippy"
runs-on: ubuntu-latest

steps:
- name: "Checkout"
uses: actions/checkout@master

- name: "Rust"
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
components: clippy
components: rustfmt, clippy

- name: "Dependencies"
run: sudo apt-get install -y ${{ env.APT_PACKAGES }}

- name: "Format"
run: cargo fmt -- --check

- name: "Clippy"
run: cargo clippy -- -D warnings

check:
name: "Check"
runs-on: ubuntu-latest

strategy:
matrix:
target: ["x86_64-pc-windows-gnu", "x86_64-unknown-linux-gnu"]

steps:
- name: "Checkout"
uses: actions/checkout@master

- name: "Rust"
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
targets: ${{ matrix.target }}

- name: "Dependencies"
if: contains(matrix.target, 'linux')
run: sudo apt-get install -y ${{ env.APT_PACKAGES }}

- name: "Check"
run: cargo check --target ${{ matrix.target }}
2 changes: 1 addition & 1 deletion .run/Debug.run.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Debug" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
<option name="command" value="run --features no-admin" />
<option name="command" value="run --bin dygma-layer-switcher" />
<option name="workingDirectory" value="file://$PROJECT_DIR$" />
<option name="emulateTerminal" value="true" />
<option name="channel" value="DEFAULT" />
Expand Down
2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
resolver = "2"
members = [
"dygma-layer-switcher",
"common",
"windows",
]

[profile.release]
Expand Down
15 changes: 0 additions & 15 deletions common/Cargo.toml

This file was deleted.

31 changes: 0 additions & 31 deletions common/src/app.rs

This file was deleted.

Loading

0 comments on commit 6d271ae

Please sign in to comment.