.2059806565729300:1cdc91c9ec2e77ad7595657af3aef7d8_69e3499ab13256d09ece8088.69e4e048b13256d09ece8616.69e4e0477afba9383018b93f:Trae CN.T(2026/4/19 22:01:44)

.github/workflows/build-tauri.yml

@@ -126,6 +126,15 @@ jobs:
             python3 -m venv venv
             source venv/bin/activate || source venv/Scripts/activate
             poetry install
+
+            echo "========================================"
+            echo "Running Doctor Check (fail-fast)"
+            echo "========================================"
+            make doctor
+
+            echo "========================================"
+            echo "Starting Build"
+            echo "========================================"
             make build SKIP_WEBUI=${{ matrix.skip_webui }} SKIP_SERVER_RUST=${{ matrix.skip_rust }}
             pip freeze
 
@@ -143,7 +152,31 @@ jobs:
         run: |
           source venv/bin/activate || source venv/Scripts/activate
           poetry install
-          make package SKIP_SERVER_RUST=${{ matrix.skip_rust }}
+
+          echo "========================================"
+          echo "Running package with STRICT mode (CI)"
+          echo "========================================"
+
+          # For Windows, also enable WINDOWS_VERIFY_STRICT=true
+          # This ensures zip contents match source directory before installer creation
+          if [[ "$RUNNER_OS" == "Windows" ]]; then
+            echo "TAURI_BUILD=true WINDOWS_VERIFY_STRICT=true PACKAGE_STRICT=true make package SKIP_SERVER_RUST=${{ matrix.skip_rust }}"
+            echo ""
+            echo "Windows-specific: Also verifying that zip contents match source directory"
+            echo ""
+
+            # Use PACKAGE_STRICT=true and WINDOWS_VERIFY_STRICT=true for CI
+            # - PACKAGE_STRICT=true: Fail on any verification errors
+            # - WINDOWS_VERIFY_STRICT=true: Fail if zip contents differ from source
+            # If verification fails, build will fail and artifacts will NOT be uploaded
+            TAURI_BUILD=true WINDOWS_VERIFY_STRICT=true PACKAGE_STRICT=true make package SKIP_SERVER_RUST=${{ matrix.skip_rust }}
+          else
+            echo "TAURI_BUILD=true PACKAGE_STRICT=true make package SKIP_SERVER_RUST=${{ matrix.skip_rust }}"
+            echo ""
+
+            # Use PACKAGE_STRICT=true for CI - fails on any verification errors
+            TAURI_BUILD=true PACKAGE_STRICT=true make package SKIP_SERVER_RUST=${{ matrix.skip_rust }}
+          fi
 
       - name: Package dmg
         if: runner.os == 'macOS'

.github/workflows/build.yml

@@ -132,6 +132,15 @@ jobs:
         python3 -m venv venv
         source venv/bin/activate || source venv/Scripts/activate
         poetry install
+
+        echo "========================================"
+        echo "Running Doctor Check (fail-fast)"
+        echo "========================================"
+        make doctor
+
+        echo "========================================"
+        echo "Starting Build"
+        echo "========================================"
         make build SKIP_WEBUI=${{ matrix.skip_webui }} SKIP_SERVER_RUST=${{ matrix.skip_rust }}
         pip freeze  # output Python packages, useful for debugging dependency versions
 
@@ -151,7 +160,31 @@ jobs:
       run: |
         source venv/bin/activate || source venv/Scripts/activate
         poetry install  # run again to ensure we have the correct version of PyInstaller
-        make package SKIP_SERVER_RUST=${{ matrix.skip_rust }}
+
+        echo "========================================"
+        echo "Running package with STRICT mode (CI)"
+        echo "========================================"
+
+        # For Windows, also enable WINDOWS_VERIFY_STRICT=true
+        # This ensures zip contents match source directory before installer creation
+        if [[ "$RUNNER_OS" == "Windows" ]]; then
+          echo "WINDOWS_VERIFY_STRICT=true PACKAGE_STRICT=true make package SKIP_SERVER_RUST=${{ matrix.skip_rust }}"
+          echo ""
+          echo "Windows-specific: Also verifying that zip contents match source directory"
+          echo ""
+
+          # Use PACKAGE_STRICT=true and WINDOWS_VERIFY_STRICT=true for CI
+          # - PACKAGE_STRICT=true: Fail on any verification errors
+          # - WINDOWS_VERIFY_STRICT=true: Fail if zip contents differ from source
+          # If verification fails, build will fail and artifacts will NOT be uploaded
+          WINDOWS_VERIFY_STRICT=true PACKAGE_STRICT=true make package SKIP_SERVER_RUST=${{ matrix.skip_rust }}
+        else
+          echo "PACKAGE_STRICT=true make package SKIP_SERVER_RUST=${{ matrix.skip_rust }}"
+          echo ""
+
+          # Use PACKAGE_STRICT=true for CI - fails on any verification errors
+          PACKAGE_STRICT=true make package SKIP_SERVER_RUST=${{ matrix.skip_rust }}
+        fi
 
     - name: Package dmg
       if: runner.os == 'macOS'

.github/workflows/test.yml

@@ -6,7 +6,25 @@ on:
   #pull_request:
   #  branches: [ master ]
   workflow_dispatch:
-
+    inputs:
+      skip_build:
+        description: "Skip build and use downloaded binary instead"
+        required: false
+        default: 'false'
+        type: choice
+        options:
+          - 'true'
+          - 'false'
+      version:
+        description: "Version to download when skip_build=true (e.g., v0.14.0)"
+        required: false
+        default: 'latest'
+        type: string
+      test_timeout:
+        description: "Global test timeout in seconds"
+        required: false
+        default: '300'
+        type: string
 
 
 jobs:
@@ -173,3 +191,256 @@ jobs:
           echo "\n---\n"
           cat log-new.txt || true
 
+
+  # Integration tests using make test-integration
+  integration:
+    name: Integration (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 15
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        python_version: ['3.12']
+
+    env:
+      TEST_TIMEOUT: ${{ inputs.test_timeout || '300' }}
+      AW_SERVER_TIMEOUT: '60'
+      AW_PYTEST_TIMEOUT: '120'
+      AW_LOG_LINES: '200'
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+        with:
+          submodules: 'recursive'
+          fetch-depth: 0
+
+      - name: Print environment info
+        run: |
+          echo "OS: ${{ matrix.os }}"
+          echo "Runner: $RUNNER_OS"
+          echo "Architecture: $(uname -m)"
+          echo "Python version: ${{ matrix.python_version }}"
+          echo ""
+          echo "Test Configuration:"
+          echo "  Global timeout: ${TEST_TIMEOUT}s"
+          echo "  Server startup timeout: ${AW_SERVER_TIMEOUT}s"
+          echo "  Pytest timeout: ${AW_PYTEST_TIMEOUT}s"
+          echo "  Log lines on failure: ${AW_LOG_LINES}"
+          echo "  Skip build: ${{ inputs.skip_build }}"
+          echo "  Version: ${{ inputs.version }}"
+
+      - name: Install coreutils (macOS)
+        if: runner.os == 'macOS'
+        run: |
+          brew install coreutils
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python_version }}
+
+      - name: Set up Rust
+        if: ${{ inputs.skip_build != 'true' }}
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+
+      - name: Install Poetry
+        run: |
+          pip3 install poetry==1.4.2
+
+      - name: Create virtual environment
+        run: |
+          python3 -m venv venv
+          source venv/bin/activate
+          poetry install
+
+      - name: Download ActivityWatch binary (skip_build=true)
+        if: ${{ inputs.skip_build == 'true' }}
+        shell: bash
+        run: |
+          set -e
+          mkdir -p dist
+          cd dist
+
+          OS=${{ matrix.os }}
+          if [ "$OS" = "ubuntu-latest" ] || [ "$OS" = "Linux" ]; then
+            PLATFORM="linux"
+          elif [ "$OS" = "macos-latest" ] || [ "$OS" = "macOS" ]; then
+            PLATFORM="macos"
+          else
+            echo "ERROR: Unsupported OS: $OS"
+            exit 1
+          fi
+
+          ARCH=$(uname -m)
+          if [ "$ARCH" = "x86_64" ]; then
+            ARCH="x86_64"
+          elif [ "$ARCH" = "arm64" ] || [ "$ARCH" = "aarch64" ]; then
+            ARCH="arm64"
+          fi
+
+          VERSION="${{ inputs.version }}"
+          if [ "$VERSION" = "latest" ] || [ -z "$VERSION" ]; then
+            echo "Fetching latest release..."
+            LATEST_JSON=$(curl -s https://api.github.com/repos/ActivityWatch/activitywatch/releases/latest)
+            VERSION=$(echo "$LATEST_JSON" | grep -o '"tag_name": *"[^"]*"' | cut -d'"' -f4)
+            echo "Latest version: $VERSION"
+          fi
+
+          # Remove 'v' prefix for filename if present
+          VERSION_NO_V=$(echo "$VERSION" | sed -e 's/^v//')
+
+          ZIP_FILE="activitywatch-${VERSION_NO_V}-${PLATFORM}-${ARCH}.zip"
+          DOWNLOAD_URL="https://github.com/ActivityWatch/activitywatch/releases/download/${VERSION}/${ZIP_FILE}"
+
+          echo "Platform: $PLATFORM"
+          echo "Arch: $ARCH"
+          echo "Version: $VERSION"
+          echo "Version (no v): $VERSION_NO_V"
+          echo "Download URL: $DOWNLOAD_URL"
+
+          echo ""
+          echo "Downloading $ZIP_FILE..."
+          curl -f -L -o "$ZIP_FILE" "$DOWNLOAD_URL"
+
+          echo ""
+          echo "Unzipping..."
+          unzip -q "$ZIP_FILE"
+          ls -la activitywatch/
+
+          echo ""
+          echo "Done. Binary location: $(pwd)/activitywatch/"
+
+      - name: Build ActivityWatch (skip_build=false)
+        if: ${{ inputs.skip_build != 'true' }}
+        run: |
+          source venv/bin/activate
+          make build SKIP_WEBUI=true SKIP_SERVER_RUST=false
+          ls -la dist/
+
+      - name: Find server binary
+        shell: bash
+        run: |
+          set -e
+          echo "Looking for server binary..."
+          echo ""
+
+          SERVER_BIN=""
+
+          # Try aw-server-rust first (most likely for Tauri build)
+          if [ -f "dist/activitywatch/aw-server-rust/aw-server" ]; then
+            SERVER_BIN="dist/activitywatch/aw-server-rust/aw-server"
+          elif [ -f "dist/activitywatch/aw-server-rust/aw-server.exe" ]; then
+            SERVER_BIN="dist/activitywatch/aw-server-rust/aw-server.exe"
+          # Try aw-server (Python)
+          elif [ -f "dist/activitywatch/aw-server/aw-server" ]; then
+            SERVER_BIN="dist/activitywatch/aw-server/aw-server"
+          elif [ -f "dist/activitywatch/aw-server/aw-server.exe" ]; then
+            SERVER_BIN="dist/activitywatch/aw-server/aw-server.exe"
+          fi
+
+          if [ -z "$SERVER_BIN" ]; then
+            echo "ERROR: Could not find server binary"
+            echo ""
+            echo "Contents of dist/:"
+            ls -la dist/ 2>/dev/null || echo "(dist/ not found)"
+            echo ""
+            echo "Contents of dist/activitywatch/ (if exists):"
+            ls -la dist/activitywatch/ 2>/dev/null || echo "(dist/activitywatch/ not found)"
+            exit 1
+          fi
+
+          echo "Found server binary: $SERVER_BIN"
+          echo "AW_SERVER_BIN=${SERVER_BIN}" >> $GITHUB_ENV
+
+      - name: Determine and output version
+        run: |
+          source venv/bin/activate
+
+          TAG_VERSION=$(bash scripts/package/getversion.sh --tag)
+          DISPLAY_VERSION=$(bash scripts/package/getversion.sh --display)
+
+          echo "TAG_VERSION=${TAG_VERSION}" >> $GITHUB_ENV
+          echo "DISPLAY_VERSION=${DISPLAY_VERSION}" >> $GITHUB_ENV
+
+          echo "========================================"
+          echo "Build Version Information"
+          echo "========================================"
+          echo "GitHub ref: ${{ github.ref }}"
+          echo "GitHub ref_name: ${{ github.ref_name }}"
+          echo "TAG_VERSION:        ${TAG_VERSION}"
+          echo "DISPLAY_VERSION:    ${DISPLAY_VERSION}"
+          echo "========================================"
+
+      - name: Run integration tests
+        id: integration_tests
+        shell: bash
+        timeout-minutes: 10
+        run: |
+          source venv/bin/activate
+
+          echo "========================================"
+          echo "Running Integration Tests"
+          echo "========================================"
+          echo "Server binary: $AW_SERVER_BIN"
+          echo "Server port: ${AW_SERVER_PORT:-5666}"
+          echo "Server timeout: ${AW_SERVER_TIMEOUT}s"
+          echo "Global test timeout: ${TEST_TIMEOUT}s"
+          echo ""
+
+          export AW_SERVER_BIN="$AW_SERVER_BIN"
+          export AW_SERVER_TIMEOUT="$AW_SERVER_TIMEOUT"
+          export AW_LOG_LINES="$AW_LOG_LINES"
+          export AW_TEST_TIMEOUT="$TEST_TIMEOUT"
+          export AW_PYTEST_TIMEOUT="$AW_PYTEST_TIMEOUT"
+
+          # Run tests with timeout protection
+          # Using timeout/gtimeout with SIGKILL as last resort
+          # Also using pytest-timeout as per-test protection
+
+          if [ "$RUNNER_OS" = "Linux" ]; then
+            timeout --signal=SIGKILL "$TEST_TIMEOUT" \
+              pytest scripts/tests/integration_tests.py -v \
+                --timeout="$AW_PYTEST_TIMEOUT" \
+                -o timeout_method=thread
+          elif [ "$RUNNER_OS" = "macOS" ]; then
+            gtimeout --signal=SIGKILL "$TEST_TIMEOUT" \
+              pytest scripts/tests/integration_tests.py -v \
+                --timeout="$AW_PYTEST_TIMEOUT" \
+                -o timeout_method=thread
+          else
+            # Windows (though we're not testing Windows yet)
+            pytest scripts/tests/integration_tests.py -v \
+              --timeout="$AW_PYTEST_TIMEOUT" \
+              -o timeout_method=thread
+          fi
+
+      - name: Output test result
+        if: always()
+        run: |
+          echo "========================================"
+          echo "Integration Tests Result"
+          echo "========================================"
+          echo "OS: ${{ matrix.os }}"
+          echo "Python: ${{ matrix.python_version }}"
+          echo ""
+          echo "Test Status (from step.outcome): ${{ steps.integration_tests.outcome }}"
+          echo ""
+          if [ "${{ steps.integration_tests.outcome }}" = "success" ]; then
+            echo "✅ Tests PASSED"
+          elif [ "${{ steps.integration_tests.outcome }}" = "failure" ]; then
+            echo "❌ Tests FAILED"
+          elif [ "${{ steps.integration_tests.outcome }}" = "cancelled" ]; then
+            echo "⏹️ Tests CANCELLED (possibly timeout)"
+          else
+            echo "⚠️ Tests: ${{ steps.integration_tests.outcome }}"
+          fi
+          echo ""
+          echo "Timeout protection in place:"
+          echo "  - Global: ${TEST_TIMEOUT}s (via timeout/gtimeout)"
+          echo "  - Per-test: ${AW_PYTEST_TIMEOUT}s (via pytest-timeout)"
+          echo "========================================"
+