Skip to content
Closed
Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion .github/workflows/build-tauri.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.experimental }}
env:
# Whether to build and include extras (like aw-notify and aw-watcher-input)
# Whether to build and include extras (like aw-notify-rs and aw-watcher-input)
AW_EXTRAS: true
TAURI_BUILD: true
# sets the macOS version target, see: https://users.rust-lang.org/t/compile-rust-binary-for-older-versions-of-mac-osx/38695
Expand Down Expand Up @@ -88,6 +88,7 @@ jobs:
path: |
aw-server-rust/target
aw-tauri/src-tauri/target
aw-notify-rs/target
key: ${{ matrix.os }}-${{ env.cache-name }}-${{ steps.toolchain.outputs.cachekey }}-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ matrix.os }}-${{ env.cache-name }}-${{ steps.toolchain.outputs.rustc_hash }}-
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.experimental }}
env:
# Whether to build and include extras (like aw-notify and aw-watcher-input)
# Whether to build and include extras (like aw-notify-rs and aw-watcher-input)
AW_EXTRAS: true
# sets the macOS version target, see: https://users.rust-lang.org/t/compile-rust-binary-for-older-versions-of-mac-osx/38695
MACOSX_DEPLOYMENT_TARGET: 10.9
Expand Down Expand Up @@ -85,7 +85,9 @@ jobs:
env:
cache-name: cargo-build-target
with:
path: aw-server-rust/target
path: |
aw-server-rust/target
aw-notify-rs/target
# key needs to contain rustc_hash due to https://github.com/ActivityWatch/aw-server-rust/issues/180
key: ${{ matrix.os }}-${{ env.cache-name }}-${{ steps.toolchain.outputs.cachekey }}-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
[submodule "aw-server-rust"]
path = aw-server-rust
url = https://github.com/ActivityWatch/aw-server-rust.git
[submodule "aw-notify"]
path = aw-notify
url = https://github.com/ErikBjare/aw-notify.git
[submodule "aw-watcher-input"]
path = aw-watcher-input
url = https://github.com/ActivityWatch/aw-watcher-input.git
Expand All @@ -31,3 +28,6 @@
[submodule "awatcher"]
path = awatcher
url = https://github.com/2e3s/awatcher
[submodule "aw-notify-rs"]
path = aw-notify-rs
url = https://github.com/0xbrayo/aw-notify-rs.git
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ifeq ($(SKIP_SERVER_RUST),true)
endif
# Include extras if AW_EXTRAS is true
ifeq ($(AW_EXTRAS),true)
SUBMODULES := $(SUBMODULES) aw-notify aw-watcher-input
SUBMODULES := $(SUBMODULES) aw-notify-rs aw-watcher-input
endif

# A function that checks if a target exists in a Makefile
Expand Down
1 change: 0 additions & 1 deletion aw-notify
Submodule aw-notify deleted from bcea3c
1 change: 1 addition & 0 deletions aw-notify-rs
Submodule aw-notify-rs added at 8095a1
Loading