Skip to content

Commit

Permalink
Merge branch 'ir_fix_type_infer' of github.com:shirly121/GraphScope i…
Browse files Browse the repository at this point in the history
…nto ir_fix_type_infer
  • Loading branch information
shirly121 committed Aug 13, 2024
2 parents 9727ad6 + 4fb2b91 commit 386485d
Show file tree
Hide file tree
Showing 603 changed files with 30,350 additions and 7,248 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ flex/build/
interactive_engine/rust-common/src/proto/*
!interactive_engine/rust-common/src/proto/mod.rs
**/generated/
!flex/interactive/sdk/python/gs_interactive/client/generated/

interactive_engine/executor/store/groot/src/db/proto/*
!interactive_engine/executor/store/groot/src/db/proto/mod.rs
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/build-graphscope-dev-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_wheel == 'true') || (github.event_name == 'pull_request')

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
if: false

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -154,7 +154,7 @@ jobs:
if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_graphscope_dev == 'true') || (github.event_name == 'pull_request')

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
if: false

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -260,7 +260,7 @@ jobs:
if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_vineyard_dev == 'true') || (github.event_name == 'pull_request')

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -298,7 +298,7 @@ jobs:
if: false

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -369,7 +369,7 @@ jobs:

needs: [build-vineyard-dev-image-x86-64]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -410,7 +410,7 @@ jobs:

needs: [manifest-push-vineyard-dev-image]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-graphscope-images-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:
# if: (github.ref == 'refs/heads/main' && github.repository == 'alibaba/GraphScope') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository == 'alibaba/GraphScope') || (github.pull_request == 'pull_request') || (github.event_name == 'workflow_dispatch')
if: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -347,7 +347,7 @@ jobs:
needs: [build-image-x86-64, build-image-aarch64]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-graphscope-manylinux-ext-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
build-manylinux-ext-image-x86-64:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
runs-on: [self-hosted, Linux, ARM64]
if: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/build-graphscope-wheels-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: [self-hosted, Linux, ARM64]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
# mv ${GITHUB_WORKSPACE}/coordinator/dist/*.whl ${GITHUB_WORKSPACE}/upload_pypi/
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-arm64-${{ github.sha }}
path: |
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
mv ${GITHUB_WORKSPACE}/coordinator/dist/*.whl ${GITHUB_WORKSPACE}/upload_pypi/
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-${{ github.sha }}
path: |
Expand Down Expand Up @@ -179,11 +179,11 @@ jobs:
needs: [build-wheels]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
path: artifacts

Expand Down Expand Up @@ -250,7 +250,7 @@ jobs:
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']

steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
path: artifacts

Expand Down Expand Up @@ -306,7 +306,7 @@ jobs:
--shm-size 4096m

steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
path: artifacts

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-graphscope-wheels-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
python-version: ['3.11']

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
uses: mxschmitt/action-tmate@v2

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-macos-${{ github.sha }}
path: graphscope.tar.gz
Expand All @@ -149,7 +149,7 @@ jobs:
python-version: ['3.8', '3.9', '3.10', '3.11']

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -221,7 +221,7 @@ jobs:
tar -zcf client.tar.gz python/dist/
- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-macos-${{ github.sha }}-${{ matrix.python-version }}
path: client.tar.gz
Expand All @@ -237,7 +237,7 @@ jobs:
python-version: ['3.8', '3.9', '3.10', '3.11']

steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
path: artifacts

Expand Down Expand Up @@ -285,7 +285,7 @@ jobs:
python-version: ['3.8', '3.9', '3.10', '3.11']

steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
path: artifacts

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
contents: write
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.ref }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/flex-interactive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Add envs to GITHUB_ENV
run: |
Expand All @@ -47,6 +47,7 @@ jobs:
- name: Build gsctl Wheel Package
run: |
cd ${GITHUB_WORKSPACE}/python
python3 setup_flex.py bdist_wheel
python3 setup_gsctl.py bdist_wheel
- name: Setup tmate session
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gae.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
container:
image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.22.0
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install latest vineyard
if: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gaia.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
gaia-test:
runs-on: [self-hosted, manylinux2014]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true

Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
- name: Upload GIE log
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
continue-on-error: true
with:
name: gie-log
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/gss-dummy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ on:
- '!python/graphscope/client/**'
- '!charts/graphscope-store/**'
- '!.github/workflows/gss.yml'
- '!flex/openapi/openapi_coordinator.yaml'
- '!coordinator/gscoordinator/flex/**'
- '!python/graphscope/gsctl/**'
- 'interactive_engine/**.md'
- 'charts/graphscope-store/**.md'

Expand Down
Loading

0 comments on commit 386485d

Please sign in to comment.