Skip to content

Commit 6066207

Browse files
committed
rename env variable AW_SYNC_ONLY->TAURI_BUILD
1 parent 7d22b8c commit 6066207

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
skip_rust: [false]
4141
skip_webui: [false]
4242
experimental: [false]
43-
aw_sync_only: [true]
43+
tauri_build: [true]
4444
#include:
4545
# - os: ubuntu-latest
4646
# python_version: 3.9
@@ -59,7 +59,7 @@ jobs:
5959
- name: Set environment variables
6060
run: |
6161
echo "RELEASE=${{ startsWith(github.ref_name, 'v') || github.ref_name == 'master' }}" >> $GITHUB_ENV
62-
echo "AW_SYNC_ONLY=${{ matrix.aw_sync_only }}" >> $GITHUB_ENV
62+
echo "TAURI_BUILD=${{ matrix.tauri_build }}" >> $GITHUB_ENV
6363
6464
- name: Set up Python
6565
if: matrix.os != 'macOS-13'

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ PACKAGEABLES := $(foreach dir,$(SUBMODULES),$(call has_target,$(dir),package))
5050
LINTABLES := $(foreach dir,$(SUBMODULES),$(call has_target,$(dir),lint))
5151
TYPECHECKABLES := $(foreach dir,$(SUBMODULES),$(call has_target,$(dir),typecheck))
5252

53-
ifeq ($(AW_SYNC_ONLY),true)
53+
ifeq ($(TAURI_BUILD),true)
5454
PACKAGEABLES := $(filter-out aw-server-rust aw-server, $(PACKAGEABLES))
5555
endif
5656

@@ -66,7 +66,7 @@ build: aw-core/.git
6666
pip install 'setuptools>49.1.1'
6767
for module in $(SUBMODULES); do \
6868
echo "Building $$module"; \
69-
if [ "$$module" = "aw-server-rust" ] && [ "$(AW_SYNC_ONLY)" = "true" ]; then \
69+
if [ "$$module" = "aw-server-rust" ] && [ "$(TAURI_BUILD)" = "true" ]; then \
7070
make --directory=$$module aw-sync SKIP_WEBUI=$(SKIP_WEBUI) || { echo "Error in $$module aw-sync"; exit 2; }; \
7171
else \
7272
make --directory=$$module build SKIP_WEBUI=$(SKIP_WEBUI) || { echo "Error in $$module build"; exit 2; }; \
@@ -164,7 +164,7 @@ package:
164164
make --directory=$$dir package; \
165165
cp -r $$dir/dist/$$dir dist/activitywatch; \
166166
done
167-
ifeq ($(AW_SYNC_ONLY),true)
167+
ifeq ($(TAURI_BUILD),true)
168168
mkdir -p dist/activitywatch/aw-server-rust
169169
cp aw-server-rust/target/$(targetdir)/aw-sync dist/activitywatch/aw-server-rust/aw-sync
170170
endif

awatcher

Submodule awatcher updated 1 file

0 commit comments

Comments
 (0)