From 27c9a3d38ebb3c1f731532b5dda90f3980b8e290 Mon Sep 17 00:00:00 2001 From: Yiping Kang Date: Sun, 8 Sep 2024 16:55:25 -0400 Subject: [PATCH] Update action workflow for each sub-project --- .../workflows/pre-commit-cloud.yml | 14 +++++-- ...{pre_commit.yml => pre-commit-jaclang.yml} | 9 +++-- .../workflows/pre-commit-mtllm.yml | 13 +++++-- .../workflows/release-cloud.yml | 37 +++++++------------ .../workflows/release-jaclang.yml | 15 +++++--- .../workflows/release-mtllm.yml | 15 +++++--- .../workflows/release-vsce.yml | 4 +- .../workflows/test-cloud.yml | 19 ++++++---- .../workflows/test-jaclang.yml | 13 +++++-- .../workflows/test-mtllm.yml | 11 +++++- .../workflows/test-streamlit.yml | 15 ++++++-- jac-cloud/.pre-commit-config.yaml | 3 +- jac-mtllm/.pre-commit-config.yaml | 3 +- jaclang/.github/workflows/pre_commit.yml | 25 ------------- jaclang/.pre-commit-config.yaml | 3 +- 15 files changed, 109 insertions(+), 90 deletions(-) rename jac-mtllm/.github/workflows/precommit.yml => .github/workflows/pre-commit-cloud.yml (58%) rename .github/workflows/{pre_commit.yml => pre-commit-jaclang.yml} (70%) rename jac-cloud/.github/workflows/pre_commit.yml => .github/workflows/pre-commit-mtllm.yml (59%) rename jac-cloud/.github/workflows/release.yml => .github/workflows/release-cloud.yml (50%) rename jaclang/.github/workflows/release.yml => .github/workflows/release-jaclang.yml (65%) rename jac-mtllm/.github/workflows/release.yml => .github/workflows/release-mtllm.yml (66%) rename jaclang/.github/workflows/vscode_ext_release.yml => .github/workflows/release-vsce.yml (93%) rename jac-cloud/.github/workflows/run_plugin_pytest.yml => .github/workflows/test-cloud.yml (83%) rename jaclang/.github/workflows/run_pytest.yml => .github/workflows/test-jaclang.yml (69%) rename jac-mtllm/.github/workflows/test.yml => .github/workflows/test-mtllm.yml (73%) rename jaclang/.github/workflows/run_plugin_tests.yml => .github/workflows/test-streamlit.yml (65%) delete mode 100644 jaclang/.github/workflows/pre_commit.yml diff --git a/jac-mtllm/.github/workflows/precommit.yml b/.github/workflows/pre-commit-cloud.yml similarity index 58% rename from jac-mtllm/.github/workflows/precommit.yml rename to .github/workflows/pre-commit-cloud.yml index 1cede323cb..c3ad56f1a4 100644 --- a/jac-mtllm/.github/workflows/precommit.yml +++ b/.github/workflows/pre-commit-cloud.yml @@ -1,14 +1,21 @@ -name: Linting and Pre-commit checks +name: Linting and Pre-commit checks for jac-cloud on: pull_request: + paths: + - "jac-cloud/**" push: branches: - main + paths: + - "jac-cloud/**" jobs: - pre-commit: + pre-commit-cloud: runs-on: ubuntu-latest + defaults: + run: + working-directory: jac-cloud steps: - name: Check out code uses: actions/checkout@v2 @@ -22,4 +29,5 @@ jobs: run: pip install pre-commit - name: Run pre-commit hooks - run: pre-commit run --all-files \ No newline at end of file + run: pre-commit run --files $(find . -type f) + diff --git a/.github/workflows/pre_commit.yml b/.github/workflows/pre-commit-jaclang.yml similarity index 70% rename from .github/workflows/pre_commit.yml rename to .github/workflows/pre-commit-jaclang.yml index 53552851e9..8c23a5b14f 100644 --- a/.github/workflows/pre_commit.yml +++ b/.github/workflows/pre-commit-jaclang.yml @@ -1,4 +1,4 @@ -name: Linting and Pre-commit checks +name: Linting and Pre-commit checks for jaclang on: pull_request: @@ -11,8 +11,11 @@ on: - "jaclang/**" jobs: - pre-commit: + pre-commit-jaclang: runs-on: ubuntu-latest + defaults: + run: + working-directory: jaclang steps: - name: Check out code uses: actions/checkout@v2 @@ -26,4 +29,4 @@ jobs: run: pip install pre-commit - name: Run pre-commit hooks - run: cd jaclang; pre-commit run --all-files \ No newline at end of file + run: pre-commit run --files $(find . -type f) diff --git a/jac-cloud/.github/workflows/pre_commit.yml b/.github/workflows/pre-commit-mtllm.yml similarity index 59% rename from jac-cloud/.github/workflows/pre_commit.yml rename to .github/workflows/pre-commit-mtllm.yml index 1cede323cb..6afcfe48ec 100644 --- a/jac-cloud/.github/workflows/pre_commit.yml +++ b/.github/workflows/pre-commit-mtllm.yml @@ -1,14 +1,21 @@ -name: Linting and Pre-commit checks +name: Linting and Pre-commit checks for jac-mtllm on: pull_request: + paths: + - "jac-mtllm/**" push: branches: - main + paths: + - "jac-mtllm/**" jobs: - pre-commit: + pre-commit-mtllm: runs-on: ubuntu-latest + defaults: + run: + working-directory: jac-mtllm steps: - name: Check out code uses: actions/checkout@v2 @@ -22,4 +29,4 @@ jobs: run: pip install pre-commit - name: Run pre-commit hooks - run: pre-commit run --all-files \ No newline at end of file + run: pre-commit run --files $(find . -type f) diff --git a/jac-cloud/.github/workflows/release.yml b/.github/workflows/release-cloud.yml similarity index 50% rename from jac-cloud/.github/workflows/release.yml rename to .github/workflows/release-cloud.yml index 17273b3bd0..15994c57fa 100644 --- a/jac-cloud/.github/workflows/release.yml +++ b/.github/workflows/release-cloud.yml @@ -1,15 +1,14 @@ -name: Release to PyPI +name: Release jac-cloud to PYPI on: workflow_dispatch -# on: -# push: -# tags: -# - 'v*.*.*' jobs: - release: + release-cloud: name: Release runs-on: ubuntu-latest + defaults: + run: + working-directory: jac-cloud steps: - name: Checkout code @@ -25,14 +24,6 @@ jobs: python -m pip install --upgrade pip pip install setuptools wheel twine - # - name: Extract version from tag - # id: get_version - # run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/} - - # - name: Update version in setup.py - # run: | - # sed -i 's/VERSION = ".*"/VERSION = "${{ steps.get_version.outputs.VERSION }}"/' setup.py - - name: Build package run: python setup.py sdist bdist_wheel @@ -42,12 +33,12 @@ jobs: TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} run: twine upload dist/* - - name: Create GitHub Release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} - draft: false - prerelease: false \ No newline at end of file + # - name: Create GitHub Release + # uses: actions/create-release@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # tag_name: ${{ github.ref }} + # release_name: Release ${{ github.ref }} + # draft: false + # prerelease: false diff --git a/jaclang/.github/workflows/release.yml b/.github/workflows/release-jaclang.yml similarity index 65% rename from jaclang/.github/workflows/release.yml rename to .github/workflows/release-jaclang.yml index 862bb0c786..6af3ca0dde 100644 --- a/jaclang/.github/workflows/release.yml +++ b/.github/workflows/release-jaclang.yml @@ -1,11 +1,14 @@ -name: PyPI Release +name: Release jaclang to PYPI on: workflow_dispatch: jobs: - release: + release-jaclang: runs-on: ubuntu-latest + defaults: + run: + working-directory: jaclang steps: - name: Checkout code @@ -22,7 +25,7 @@ jobs: poetry config pypi-token.pypi ${{ secrets.PYPI_TOKEN }} poetry build poetry publish - - run: pip install githubrelease - - run: python scripts/gh_release.py - env: - GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} \ No newline at end of file + # - run: pip install githubrelease + # - run: python scripts/gh_release.py + # env: + # GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} diff --git a/jac-mtllm/.github/workflows/release.yml b/.github/workflows/release-mtllm.yml similarity index 66% rename from jac-mtllm/.github/workflows/release.yml rename to .github/workflows/release-mtllm.yml index de312d73f9..d2a8aff836 100644 --- a/jac-mtllm/.github/workflows/release.yml +++ b/.github/workflows/release-mtllm.yml @@ -1,11 +1,14 @@ -name: PyPI Release +name: Release jac-mtllm to PYPI on: workflow_dispatch: jobs: - release: + release-mtllm: runs-on: ubuntu-latest + defaults: + run: + working-directory: jac-mtllm steps: - name: Checkout code uses: actions/checkout@v2 @@ -23,7 +26,7 @@ jobs: poetry config pypi-token.pypi ${{ secrets.PYPI_TOKEN }} poetry publish continue-on-error: true - - run: pip install githubrelease markdown-to-json - - run: python scripts/gh_release.py - env: - GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} \ No newline at end of file + # - run: pip install githubrelease markdown-to-json + # - run: python scripts/gh_release.py + # env: + # GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} diff --git a/jaclang/.github/workflows/vscode_ext_release.yml b/.github/workflows/release-vsce.yml similarity index 93% rename from jaclang/.github/workflows/vscode_ext_release.yml rename to .github/workflows/release-vsce.yml index 561358061f..05ea6e182a 100644 --- a/jaclang/.github/workflows/vscode_ext_release.yml +++ b/.github/workflows/release-vsce.yml @@ -1,10 +1,10 @@ -name: VSCE Release +name: Release VSCE on: workflow_dispatch: jobs: - release: + release-vsce: permissions: contents: write issues: write diff --git a/jac-cloud/.github/workflows/run_plugin_pytest.yml b/.github/workflows/test-cloud.yml similarity index 83% rename from jac-cloud/.github/workflows/run_plugin_pytest.yml rename to .github/workflows/test-cloud.yml index f4ea0d22db..08cf4f5edd 100644 --- a/jac-cloud/.github/workflows/run_plugin_pytest.yml +++ b/.github/workflows/test-cloud.yml @@ -1,13 +1,21 @@ -name: Run Plugin Tests +name: Run tests for jac-cloud on: pull_request: + paths: + - "jac-cloud/**" push: branches: - main + paths: + - "jac-cloud/**" + jobs: - test: + test-cloud: runs-on: ubuntu-latest + defaults: + run: + working-directory: jac-cloud env: SHOW_ENDPOINT_RETURNS: true REDIS_HOST: redis://localhost @@ -38,12 +46,9 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - cd .. - git clone https://github.com/Jaseci-Labs/jaclang.git - cd jaclang + cd ../jaclang pip install -e . cd ../jac-cloud - pip install pytest pip install -e . - name: Run tests @@ -52,4 +57,4 @@ jobs: jac tool gen_parser jac serve jaclang_jaseci/tests/simple_graph.jac --port 8000 & sleep 3 - pytest \ No newline at end of file + pytest diff --git a/jaclang/.github/workflows/run_pytest.yml b/.github/workflows/test-jaclang.yml similarity index 69% rename from jaclang/.github/workflows/run_pytest.yml rename to .github/workflows/test-jaclang.yml index 0c6ea8cff8..a50972584b 100644 --- a/jaclang/.github/workflows/run_pytest.yml +++ b/.github/workflows/test-jaclang.yml @@ -1,14 +1,21 @@ -name: Tests +name: Run tests for jaclang on: pull_request: + paths: + - "jaclang/**" push: branches: - main + paths: + - "jaclang/**" jobs: - test: + test-jaclang: runs-on: ubuntu-latest + defaults: + run: + working-directory: jaclang steps: - name: Check out code uses: actions/checkout@v2 @@ -25,4 +32,4 @@ jobs: pip install pytest - name: Run tests - run: pytest -x \ No newline at end of file + run: pytest -x diff --git a/jac-mtllm/.github/workflows/test.yml b/.github/workflows/test-mtllm.yml similarity index 73% rename from jac-mtllm/.github/workflows/test.yml rename to .github/workflows/test-mtllm.yml index b871136695..b4984ae109 100644 --- a/jac-mtllm/.github/workflows/test.yml +++ b/.github/workflows/test-mtllm.yml @@ -1,14 +1,21 @@ -name: tests +name: Run tests for jac-mtllm on: pull_request: + paths: + - "jac-mtllm/**" push: branches: - main + paths: + - "jac-mtllm/**" jobs: - test: + test-mtllm: runs-on: ubuntu-latest + defaults: + run: + working-directory: jac-mtllm steps: - name: Check out code uses: actions/checkout@v2 diff --git a/jaclang/.github/workflows/run_plugin_tests.yml b/.github/workflows/test-streamlit.yml similarity index 65% rename from jaclang/.github/workflows/run_plugin_tests.yml rename to .github/workflows/test-streamlit.yml index c39803fe62..5932a1f9ee 100644 --- a/jaclang/.github/workflows/run_plugin_tests.yml +++ b/.github/workflows/test-streamlit.yml @@ -1,14 +1,21 @@ -name: Plugin Tests +name: Run tests for jac-streamlit on: pull_request: + paths: + - "tool_plugins/streamlit/**" push: branches: - main + paths: + - "tool_plugins/streamlit/**" jobs: - streamlit: + test-streamlit: runs-on: ubuntu-latest + defaults: + run: + working-directory: tool_plugins/streamlit steps: - name: Check out code uses: actions/checkout@v2 @@ -25,7 +32,7 @@ jobs: pip install pytest - name: Install Plugin - run: pip install -e support/plugins/streamlit + run: pip install -e . - name: Run tests - run: pytest support/plugins/streamlit + run: pytest diff --git a/jac-cloud/.pre-commit-config.yaml b/jac-cloud/.pre-commit-config.yaml index dbdcd3a44f..19ef0bf044 100644 --- a/jac-cloud/.pre-commit-config.yaml +++ b/jac-cloud/.pre-commit-config.yaml @@ -14,6 +14,7 @@ repos: rev: 7.1.0 hooks: - id: flake8 + args: ["--config=jac-cloud/.flake8"] additional_dependencies: [pep8-naming, flake8_import_order, flake8_docstrings, flake8_comprehensions, flake8_bugbear, flake8_annotations, flake8_simplify] - repo: https://github.com/pre-commit/mirrors-mypy rev: v1.8.0 @@ -23,4 +24,4 @@ repos: exclude: 'venv|__jac_gen__|tests|setup.py' args: - --follow-imports=silent - - --ignore-missing-imports \ No newline at end of file + - --ignore-missing-imports diff --git a/jac-mtllm/.pre-commit-config.yaml b/jac-mtllm/.pre-commit-config.yaml index b1fc355096..e62aff9de3 100644 --- a/jac-mtllm/.pre-commit-config.yaml +++ b/jac-mtllm/.pre-commit-config.yaml @@ -14,6 +14,7 @@ repos: rev: 6.1.0 hooks: - id: flake8 + args: ["--config=jac-mtllm/.flake8"] additional_dependencies: [pep8-naming, flake8_import_order, flake8_docstrings, flake8_comprehensions, flake8_bugbear, flake8_annotations, flake8_simplify] - repo: https://github.com/pre-commit/mirrors-mypy rev: v1.8.0 @@ -22,4 +23,4 @@ repos: additional_dependencies: [types-PyYAML, types-requests] args: - --follow-imports=silent - - --ignore-missing-imports \ No newline at end of file + - --ignore-missing-imports diff --git a/jaclang/.github/workflows/pre_commit.yml b/jaclang/.github/workflows/pre_commit.yml deleted file mode 100644 index 1cede323cb..0000000000 --- a/jaclang/.github/workflows/pre_commit.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Linting and Pre-commit checks - -on: - pull_request: - push: - branches: - - main - -jobs: - pre-commit: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: 3.12 - - - name: Install pre-commit - run: pip install pre-commit - - - name: Run pre-commit hooks - run: pre-commit run --all-files \ No newline at end of file diff --git a/jaclang/.pre-commit-config.yaml b/jaclang/.pre-commit-config.yaml index 7ec7bb85f6..2c01fded85 100644 --- a/jaclang/.pre-commit-config.yaml +++ b/jaclang/.pre-commit-config.yaml @@ -15,6 +15,7 @@ repos: rev: 6.1.0 hooks: - id: flake8 + args: ['--config=jaclang/.flake8'] additional_dependencies: [pep8-naming, flake8_import_order, flake8_docstrings, flake8_comprehensions, flake8_bugbear, flake8_annotations, flake8_simplify] exclude: "examples|vendor|langserve/tests|pygame_mock" - repo: https://github.com/pre-commit/mirrors-mypy @@ -24,4 +25,4 @@ repos: exclude: 'venv|__jac_gen__|tests|stubs|support|vendor|examples/reference|setup.py|generated' args: - --follow-imports=silent - - --ignore-missing-imports \ No newline at end of file + - --ignore-missing-imports