Skip to content

Commit

Permalink
Merge branch 'develop' into msar_obj_removal_func
Browse files Browse the repository at this point in the history
  • Loading branch information
mathemancer committed Dec 16, 2024
2 parents 4b530c5 + f157aed commit 0728f70
Show file tree
Hide file tree
Showing 109 changed files with 2,045 additions and 1,311 deletions.
2 changes: 1 addition & 1 deletion .github/sync.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mathesar-foundation/mathesar-ansible:
mathesar-foundation/mathesar-infrastructure:
- .github/workflows/toc.yml
- .github/workflows/stale.yml
mathesar-foundation/mathesar-data-playground:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/staging-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
staging-deploy:
runs-on: ubuntu-latest
steps:
- name: Checkout ansible repo
- name: Checkout infrastructure repo
uses: actions/checkout@v2
with:
repository: 'mathesar-foundation/mathesar-ansible'
repository: 'mathesar-foundation/mathesar-infrastructure'
token: ${{ secrets.MATHESAR_ORG_GITHUB_TOKEN }} # Repo is private, so an access token is used
# This checkout is used for getting the 'action' from the current repo
- name: Checkout mathesar repo
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sync-github-labels-milestones.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
steps:
- uses: actions/checkout@v2
- run: composer global require 'vanilla/github-sync'
- run: /home/runner/.composer/vendor/bin/github-sync labels -f mathesar-foundation/mathesar -t mathesar-foundation/mathesar-ansible -d
- run: /home/runner/.composer/vendor/bin/github-sync labels -f mathesar-foundation/mathesar -t mathesar-foundation/mathesar-infrastructure -d
- run: /home/runner/.composer/vendor/bin/github-sync labels -f mathesar-foundation/mathesar -t mathesar-foundation/mathesar-data-playground -d
- run: /home/runner/.composer/vendor/bin/github-sync labels -f mathesar-foundation/mathesar -t mathesar-foundation/mathesar-design -d
- run: /home/runner/.composer/vendor/bin/github-sync labels -f mathesar-foundation/mathesar -t mathesar-foundation/mathesar-internal-crm -d
- run: /home/runner/.composer/vendor/bin/github-sync labels -f mathesar-foundation/mathesar -t mathesar-foundation/mathesar-private-notes -d
- run: /home/runner/.composer/vendor/bin/github-sync labels -f mathesar-foundation/mathesar -t mathesar-foundation/mathesar-scripts -d
- run: /home/runner/.composer/vendor/bin/github-sync labels -f mathesar-foundation/mathesar -t mathesar-foundation/mathesar-website -d
- run: /home/runner/.composer/vendor/bin/github-sync labels -f mathesar-foundation/mathesar -t mathesar-foundation/mathesar-wiki -d
- run: /home/runner/.composer/vendor/bin/github-sync milestones -f mathesar-foundation/mathesar -t mathesar-foundation/mathesar-ansible -s open
- run: /home/runner/.composer/vendor/bin/github-sync milestones -f mathesar-foundation/mathesar -t mathesar-foundation/mathesar-infrastructure -s open
- run: /home/runner/.composer/vendor/bin/github-sync milestones -f mathesar-foundation/mathesar -t mathesar-foundation/mathesar-data-playground -s open
- run: /home/runner/.composer/vendor/bin/github-sync milestones -f mathesar-foundation/mathesar -t mathesar-foundation/mathesar-design -s open
- run: /home/runner/.composer/vendor/bin/github-sync milestones -f mathesar-foundation/mathesar -t mathesar-foundation/mathesar-internal-crm -s open
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/test-and-lint-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,30 @@ jobs:
- name: Run tests with pg_prove
run: docker exec mathesar_dev_db /bin/bash /sql/run_tests.sh

api_tests:
name: Run API scenario tests
runs-on: ubuntu-latest
needs: [python_tests_required, all_be_tests_required]
if: needs.python_tests_required.outputs.tests_should_run == 'true' ||
needs.all_be_tests_required.outputs.tests_should_run
strategy:
matrix:
py-version: [3.9-bookworm, 3.10-bookworm, 3.11-bookworm, 3.12-bookworm, 3.13-bookworm]
pg-version: [13, 14, 15, 16, 17]
steps:
- uses: actions/checkout@v4
- name: Copy env file
run: cp .env.example .env
# The code is checked out under uid 1001 - reset this to 1000 for the
# container to run tests successfully
- name: Fix permissions
run: sudo chown -R 1000:1000 .
- name: Run tests
run: sh run_api_tests.sh
env:
PYTHON_VERSION: ${{ matrix.py-version }}
PG_VERSION: ${{ matrix.pg-version }}

python_lint:
name: Run Python linter
runs-on: ubuntu-latest
Expand Down
5 changes: 5 additions & 0 deletions api_tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ARG PYTHON_VERSION=3.9-bookworm
FROM python:$PYTHON_VERSION
WORKDIR /code/
COPY . .
RUN pip install -r requirements.txt
2 changes: 2 additions & 0 deletions api_tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
requests==2.32.3
pytest==8.3.3
Loading

0 comments on commit 0728f70

Please sign in to comment.