Skip to content

Commit

Permalink
update lock file
Browse files Browse the repository at this point in the history
  • Loading branch information
ieaves committed Mar 19, 2024
2 parents cd7e3d3 + 0fdc1e0 commit c7e073a
Show file tree
Hide file tree
Showing 151 changed files with 9,509 additions and 5,868 deletions.
15 changes: 7 additions & 8 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ Below you'll find a set of guidelines for how to contribute to Grai.

# Opening issues

Before you submit an issue, please check all existing open and closed issues to see if your issue has previously been resolved or is already known.
If there is already an issue logged, feel free to upvote it by adding a 👍 reaction.
Before you submit an issue, please check all existing open and closed issues to see if your issue has previously been resolved or is already known.
If there is already an issue logged, feel free to upvote it by adding a 👍 reaction.
If you would like to submit a new issue, please fill out our Issue Template to the best of your ability so we can accurately understand your report.

# Security issues & vulnerabilities

If you come across an issue related to security, or a potential attack vector within Grai or one of its dependencies, please DO NOT create a publicly viewable issue.
Instead, please contact us directly at hello@grai.io.
If you come across an issue related to security, or a potential attack vector within Grai or one of its dependencies, please DO NOT create a publicly viewable issue.
Instead, please contact us directly at hello@grai.io.
We will do everything we can to respond to the issue as soon as possible.

If you find a vulnerability within the core Grai repository, and we determine that it is remediable and of significant nature, we will be happy to pay you a reward for your findings and diligence.
If you find a vulnerability within the core Grai repository, and we determine that it is remediable and of significant nature, we will be happy to pay you a reward for your findings and diligence.
Contact us to find out more.

# Documentation edits

Grai'sdocumentation can be found directly within its codebase and you can feel free to make changes / improvements to any of it through opening a PR.
Grai'sdocumentation can be found directly within its codebase and you can feel free to make changes / improvements to any of it through opening a PR.
We utilize these files directly in our website and will periodically deploy documentation updates as necessary.

# Building additional features
Expand All @@ -29,7 +29,7 @@ If you're an incredibly awesome person and want to help us make Grai even better

## Before Starting

To help us work on new features, you can create a new feature request post in GitHub Discussion or discuss it in our Slack.
To help us work on new features, you can create a new feature request post in GitHub Discussion or discuss it in our Slack.
New functionality often has large implications across the entire Grai repo, so it is best to discuss the architecture and approach before starting work on a pull request.

## Code
Expand Down Expand Up @@ -72,4 +72,3 @@ Contributors to Grai are deemed to have acceppted
* [GitHub's Acceptable Use Policy](https://docs.github.com/en/site-policy/acceptable-use-policies/github-acceptable-use-policies)
* [GitHub's Community Guidelines](https://docs.github.com/en/site-policy/github-terms/github-community-guidelines)
* [The Developer Certificate of Origin](https://developercertificate.org/)

21 changes: 11 additions & 10 deletions .github/workflows/cli-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
working-directory: ${{ env.project_dir }}
steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Python
id: setup-python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "${{ env.py_ver }}"

Expand All @@ -43,6 +43,7 @@ jobs:

permissions:
contents: write
packages: write

outputs:
image-digest: ${{ steps.docker-build.outputs.digest }}
Expand All @@ -52,18 +53,18 @@ jobs:
working-directory: grai-server/app

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GH_TOKEN }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ghcr.io/${{ github.repository }}/grai-server-temp

Expand All @@ -72,7 +73,7 @@ jobs:

- name: Build
id: docker-build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: grai-server/app
push: true
Expand Down Expand Up @@ -110,7 +111,7 @@ jobs:
image: ghcr.io/grai-io/grai-core/grai-server-temp@${{ needs.build-server.outputs.image-digest }}
credentials:
username: ${{ github.actor }}
password: ${{ secrets.GH_TOKEN }}
password: ${{ secrets.GITHUB_TOKEN }}
env:
DB_USER: grai
DB_PASSWORD: grai
Expand All @@ -137,9 +138,9 @@ jobs:
- 6379:6379

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "${{ env.py_ver }}"

Expand Down
22 changes: 12 additions & 10 deletions .github/workflows/client-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ jobs:
working-directory: ${{ env.project_dir }}
steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Python
id: setup-python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "${{ env.py_ver }}"

Expand All @@ -42,6 +42,7 @@ jobs:

permissions:
contents: write
packages: write

outputs:
image-digest: ${{ steps.docker-build.outputs.digest }}
Expand All @@ -51,27 +52,28 @@ jobs:
working-directory: grai-server/app

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Log in to the Container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GH_TOKEN }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ghcr.io/${{ github.repository }}/grai-server-temp

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@master


- name: Build
id: docker-build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: grai-server/app
push: true
Expand Down Expand Up @@ -104,7 +106,7 @@ jobs:
image: ghcr.io/grai-io/grai-core/grai-server-temp@${{ needs.build-server.outputs.image-digest }}
credentials:
username: ${{ github.actor }}
password: ${{ secrets.GH_TOKEN }}
password: ${{ secrets.GITHUB_TOKEN }}
env:
DB_USER: grai
DB_PASSWORD: grai
Expand All @@ -129,9 +131,9 @@ jobs:
ports:
- 6379:6379
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "${{ env.py_ver }}"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Run npm tests
run: npm run test:coverage
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
flags: grai-frontend
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/graph-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:
working-directory: ${{ env.project_dir }}
steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Python
id: setup-python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "${{ env.py_ver }}"

Expand Down Expand Up @@ -80,9 +80,9 @@ jobs:
- 6379:6379

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "${{ env.py_ver }}"

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/integration-bigquery-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
working-directory: ${{ env.project_dir }}
steps:
- name: Check out Git repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Python
id: setup-python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "${{ env.py_ver }}"

Expand Down Expand Up @@ -73,9 +73,9 @@ jobs:
# --health-retries 10
# --health-start-period 30s
# steps:
# - uses: actions/checkout@v3
# - uses: actions/checkout@v4
#
# - uses: actions/setup-python@v4
# - uses: actions/setup-python@v5
# with:
# python-version: "${{ env.py_ver }}"
#
Expand Down
124 changes: 124 additions & 0 deletions .github/workflows/integration-cube-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
name: Cube Integration CI

on:
pull_request:
paths:
- "grai-integrations/source-cube/**"
- "grai-client/**"
- "grai-server/**"


concurrency:
group: ${{ github.ref }}-integration-cube-ci
cancel-in-progress: true

env:
py_ver: "3.10"
poetry_ver: "1.3.1"
project_dir: "grai-integrations/source-cube"

jobs:
lint-integration-cube:
runs-on: ubuntu-latest
defaults:
run:
working-directory: ${{ env.project_dir }}
steps:
- name: Check out Git repository
uses: actions/checkout@v4

- name: Install Python
id: setup-python
uses: actions/setup-python@v5
with:
python-version: "${{ env.py_ver }}"

- run: pip install black isort

- run: |
black . --check
isort . --profile black --check
tests-integration-cube:
needs: lint-integration-cube
runs-on: ubuntu-latest
defaults:
run:
working-directory: ${{ env.project_dir }}
# services:
# grai-db:
# image: postgres:16
# env:
# POSTGRES_USER: grai
# POSTGRES_PASSWORD: grai
# POSTGRES_DB: grai
# ports:
# - 5433:5432
# # needed because the postgres container does not provide a healthcheck
# options: --health-cmd pg_isready --health-interval 2s --health-timeout 5s --health-retries 15
# db:
# image: postgres:16
# env:
# POSTGRES_USER: cube
# POSTGRES_PASSWORD: cube
# POSTGRES_DB: cube
# ports:
# - 5434:5432
# # needed because the postgres container does not provide a healthcheck
# options: --health-cmd pg_isready --health-interval 2s --health-timeout 5s --health-retries 15
# cubeapi:
# image: cubejs/cube:latest
# volumes:
# - ${{ github.workspace }}/grai-integrations/source-cube/data/cube:/cube/conf
# ports:
# - 4000:4000
# env:
# CUBEJS_DB_TYPE: postgres
# CUBEJS_DB_HOST: db
# CUBEJS_DB_NAME: cube
# CUBEJS_DB_USER: cube
# CUBEJS_DB_PASS: cube
# CUBEJS_API_SECRET: secret
# CUBEJS_DATASOURCES: default,grai
# CUBEJS_DS_GRAI_DB_TYPE: postgres
# CUBEJS_DS_GRAI_DB_HOST: grai-db
# CUBEJS_DS_GRAI_DB_PORT: "5432"
# CUBEJS_DS_GRAI_DB_NAME: grai
# CUBEJS_DS_GRAI_DB_USER: grai
# CUBEJS_DS_GRAI_DB_PASS: grai
# CUBEJS_DEV_MODE: true
steps:

- uses: actions/checkout@v4

- name: Start Cube Stack
run: |
docker compose up -d
- uses: actions/setup-python@v5
with:
python-version: "${{ env.py_ver }}"

- uses: abatilo/actions-poetry@v2
with:
poetry-version: "${{ env.poetry_ver }}"

# - name: Set up Postgres db
# working-directory: ${{ env.project_dir }}/data/dev-database
# env:
# POSTGRES_USER: grai
# POSTGRES_PASSWORD: grai
# POSTGRES_DB: grai
# PORT: 5433
# HOST: grai-db
# run: |
# bash init-db.sh

- run: poetry install

- name: Wait for Cube to start
run: |
docker run --network container:cubeapi curlimages/curl -s --retry 10 --retry-connrefused http://localhost:4000/readyz
- name: Run Cube Tests
run: poetry run pytest
Loading

0 comments on commit c7e073a

Please sign in to comment.