Skip to content
Merged
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
7 changes: 7 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ install:
# not already installed.
- ps: if (-not(Test-Path($env:PYTHON))) { & scripts\ci\install_python.ps1 }

# Install Rust nightly and add it to PATH
- appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
- rustup-init -yv --default-toolchain nightly
- set PATH=%PATH%;%USERPROFILE%\.cargo\bin
- rustc -vV
- cargo -vV

# Required in order to get `make` to work
- "copy C:\\MinGW\\bin\\mingw32-make.exe C:\\MinGW\\bin\\make.exe"

Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
[submodule "aw-watcher-window"]
path = aw-watcher-window
url = https://github.com/ActivityWatch/aw-watcher-window.git
[submodule "aw-server-rust"]
path = aw-server-rust
url = https://github.com/ActivityWatch/aw-server-rust.git
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ before_install:
fi
# Upgrade pip
- python3 -m pip install --upgrade pip wheel;
# Install Rust
- curl https://build.travis-ci.org/files/rustup-init.sh -sSf | sh -s -- -y --default-toolchain nightly
- export PATH="$HOME/.cargo/bin:$PATH";
# Print version used
- python3 --version
- pip3 --version
Expand Down
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,12 @@ build:
make --directory=aw-server build DEV=$(DEV)
make --directory=aw-watcher-afk build DEV=$(DEV)
make --directory=aw-watcher-window build DEV=$(DEV)
make --directory=aw-server-rust build
make --directory=aw-qt build DEV=$(DEV)
# The below is needed due to: https://github.com/ActivityWatch/activitywatch/issues/173
make --directory=aw-client build DEV=$(DEV)
make --directory=aw-core build DEV=$(DEV)
#
# Needed to ensure that the server has the correct version set
python3 -c "import aw_server; print(aw_server.__version__)"


Expand Down Expand Up @@ -117,6 +118,7 @@ test:
make --directory=aw-core test
make --directory=aw-client test
make --directory=aw-server test
make --directory=aw-server-rust test
make --directory=aw-qt test

test-integration:
Expand Down Expand Up @@ -162,6 +164,10 @@ package:
#
make --directory=aw-server package
cp -r aw-server/dist/aw-server dist/activitywatch
#
make --directory=aw-server-rust package
mkdir dist/activitywatch/aw-server-rust
cp -r aw-server-rust/target/package/* dist/activitywatch/aw-server-rust
#
make --directory=aw-qt package
cp -r aw-qt/dist/aw-qt/. dist/activitywatch
Expand Down
2 changes: 1 addition & 1 deletion aw-client
Submodule aw-client updated 1 files
+1 −1 Makefile
2 changes: 1 addition & 1 deletion aw-core
Submodule aw-core updated 1 files
+1 −1 Makefile
2 changes: 1 addition & 1 deletion aw-qt
2 changes: 1 addition & 1 deletion aw-server
Submodule aw-server updated 1 files
+1 −1 Makefile
1 change: 1 addition & 0 deletions aw-server-rust
Submodule aw-server-rust added at b36c42
2 changes: 1 addition & 1 deletion aw-watcher-window