diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a29a7f..3135cc3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,7 +91,7 @@ jobs: python-version: '^3.7' - name: Build - run: python build.py build --daemon --verbose + run: python scripts/build.py daemon --verbose --install-tooling - name: Upload artifacts if: ${{ !env.ACT }} @@ -150,7 +150,7 @@ jobs: DEBIAN_FRONTEND=noninteractive sudo apt-get install libwebkit2gtk-4.0-dev libgtk-3-dev libappindicator3-dev -y - name: Build project - run: python build.py build --ui --verbose + run: python scripts/build.py ui --verbose --install-tooling - name: Upload artifacts if: ${{ !env.ACT }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 757ceb7..81f77d9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,7 +51,7 @@ jobs: python-version: '^3.7' - name: Build Daemon - run: python build.py build --daemon --verbose + run: python scripts/build.py daemon --verbose --install-tooling - uses: vimtor/action-zip@v1 with: @@ -113,7 +113,7 @@ jobs: DEBIAN_FRONTEND=noninteractive sudo apt-get install libwebkit2gtk-4.0-dev libgtk-3-dev libappindicator3-dev -y - name: Build project - run: python build.py build --ui --verbose + run: python scripts/build.py ui --verbose --install-tooling - uses: vimtor/action-zip@v1 with: diff --git a/scripts/build.py b/scripts/build.py index f3b66f9..d5fe6c0 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -62,10 +62,10 @@ def build(component: str, bundles: List[str] = None): build_daemon() build_ui(bundles) elif component == 'daemon': - check_daemon_tooling(install_tooling) + check_daemon_tooling() build_daemon() elif component == 'ui': - check_ui_tooling() + check_ui_tooling(install_tooling) build_ui(bundles) print('Build complete') @@ -116,7 +116,7 @@ def store_artifact(path: str): if os.path.isdir(path): shut.copytree(path, os.path.join( build_output, os.path.basename(path)), dirs_exist_ok=True) - else: + elif os.path.isfile(path): shut.copy(path, build_output)