Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
35 changes: 22 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,22 +200,21 @@ jobs:
name: Backend Lint
runs-on: ubuntu-latest
needs:
- build-backend
- detect-changes
if: needs.detect-changes.outputs.backend == 'true' || github.ref_name == 'develop' || github.ref_name == 'master'
permissions:
contents: read
packages: read
steps:
- name: Log in to GitHub Container Registry
uses: docker/login-action@v3
- uses: actions/checkout@v4

- name: Install uv
uses: astral-sh/setup-uv@v4
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
version: "0.5.6"

- name: Run backend lint
run: docker run --rm ${{ needs.build-backend.outputs.image }} lint
- name: Run ruff
working-directory: backend
run: |
uvx ruff check src/ ../premium/backend/src/ ../enterprise/backend/src/ tests/ ../premium/backend/tests/ ../enterprise/backend/tests/
uvx ruff format --check src/ ../premium/backend/src/ ../enterprise/backend/src/ tests/ ../premium/backend/tests/ ../enterprise/backend/tests/

frontend-lint:
name: Web-Frontend Lint
Expand Down Expand Up @@ -361,12 +360,22 @@ jobs:
-e DATABASE_USER=baserow \
-e DATABASE_PASSWORD=baserow \
${{ needs.build-backend.outputs.image }} ci-check-startup-oss-only
- name: Check backend migrations
run: |
docker run --rm --network="${{ job.services.db.network }}" \
-e DATABASE_HOST=db \
-e DATABASE_PORT=5432 \
-e DATABASE_NAME=baserow \
-e DATABASE_USER=baserow \
-e DATABASE_PASSWORD=baserow \
${{ needs.build-backend.outputs.image }} ci-check-migrations

test-backend:
name: Backend Tests (Group ${{ matrix.group }})
runs-on: ubuntu-latest
needs:
- build-backend
- backend-lint
- detect-changes
if: needs.detect-changes.outputs.backend == 'true' || github.ref_name == 'develop' || github.ref_name == 'master'
permissions:
Expand Down Expand Up @@ -975,8 +984,8 @@ jobs:
file: deploy/all-in-one/Dockerfile
push: true
build-args: |
FROM_BACKEND_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_REPO }}/backend:ci-tested-${{ env.REAL_GITHUB_SHA }}
FROM_WEBFRONTEND_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_REPO }}/web-frontend:ci-tested-${{ env.REAL_GITHUB_SHA }}
BACKEND_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_REPO }}/backend:ci-tested-${{ env.REAL_GITHUB_SHA }}
WEBFRONTEND_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_REPO }}/web-frontend:ci-tested-${{ env.REAL_GITHUB_SHA }}
tags: |
${{ env.REGISTRY }}/${{ env.IMAGE_REPO }}/baserow:ci-tested-${{ env.REAL_GITHUB_SHA }}
cache-from: type=gha,scope=all-in-one
Expand Down
4 changes: 2 additions & 2 deletions .gitlab/ci_includes/jobs.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ============== "Abstract" ci stages used by real stages =======================

# Builds a dev version of a specific Dockerfile (--target dev) using a previous CI
# Builds a dev version of a specific Dockerfile (--target ci) using a previous CI
# image or the latest develop image as a cache to speed up the build. Tags and pushes
# the resulting dev image for later stages in the pipeline to use.
#
Expand Down Expand Up @@ -149,7 +149,7 @@
$EXTRA_BUILD_ARGS \
$IMAGE_LABELS \
--push \
--target dev \
--target ci \
--tag $CI_IMAGE_PATH \
-f $DOCKERFILE_PATH .;

Expand Down
22 changes: 0 additions & 22 deletions backend/.flake8

This file was deleted.

6 changes: 0 additions & 6 deletions backend/.isort.cfg

This file was deleted.

3 changes: 3 additions & 0 deletions backend/docker/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,9 @@ case "$1" in
ci-check-startup-oss-only)
exec just ci-check-startup-oss-only
;;
ci-check-migrations)
exec just check-migrations
;;
celery-worker)
if [[ -n "${BASEROW_RUN_MINIMAL}" && $BASEROW_AMOUNT_OF_WORKERS == "1" ]]; then
export OTEL_SERVICE_NAME="celery-worker-combined"
Expand Down
1 change: 0 additions & 1 deletion backend/flake8_plugins/__init__.py

This file was deleted.

4 changes: 0 additions & 4 deletions backend/flake8_plugins/flake8_baserow/__init__.py

This file was deleted.

173 changes: 0 additions & 173 deletions backend/flake8_plugins/flake8_baserow/docstring.py

This file was deleted.

31 changes: 0 additions & 31 deletions backend/flake8_plugins/flake8_baserow/psycopg.py

This file was deleted.

Loading
Loading