Skip to content

Commit

Permalink
Merge branch 'master' into update-ai-ext
Browse files Browse the repository at this point in the history
  • Loading branch information
diksipav committed Nov 22, 2024
2 parents 7c9051d + ff9d074 commit 26ad500
Show file tree
Hide file tree
Showing 237 changed files with 28,140 additions and 13,440 deletions.
5 changes: 3 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ indent_style = space
indent_size = 2
indent_style = space

[ext/*.{c,cpp,h}]
indent_size = 4
[edb_stat_statements/*.{c,h,l,y,pl,pm}]
indent_style = tab
indent_size = tab
tab_width = 4
6 changes: 5 additions & 1 deletion .github/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ all: workflows/nightly.yml \
workflows/tests-ha.yml \
workflows/tests-pg-versions.yml \
workflows/tests-patches.yml \
workflows/tests-inplace.yml
workflows/tests-inplace.yml \
workflows/tests-reflection.yml \

workflows/%.yml: workflows.src/%.tpl.yml workflows.src/%.targets.yml workflows.src/build.inc.yml workflows.src/ls-build.inc.yml
$(ROOT)/workflows.src/render.py $* $*.targets.yml
Expand All @@ -38,3 +39,6 @@ workflows.src/tests-patches.tpl.yml: workflows.src/tests.inc.yml

workflows.src/tests-inplace.tpl.yml: workflows.src/tests.inc.yml
touch $(ROOT)/workflows.src/tests-inplace.tpl.yml

workflows.src/tests-reflection.tpl.yml: workflows.src/tests.inc.yml
touch $(ROOT)/workflows.src/tests-inplace.tpl.yml
1 change: 1 addition & 0 deletions .github/workflows.src/tests-reflection.targets.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data:
59 changes: 59 additions & 0 deletions .github/workflows.src/tests-reflection.tpl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<% from "tests.inc.yml" import build, calc_cache_key, restore_cache -%>
name: Tests with reflection validation

on:
schedule:
- cron: "0 3 * * *"
workflow_dispatch:
inputs: {}
push:
branches:
- "REFL-*"

jobs:
build:
runs-on: ubuntu-latest

steps:
<%- call build() -%>

- name: Compute cache keys
env:
GIST_TOKEN: ${{ secrets.CI_BOT_GIST_TOKEN }}
run: |
<< calc_cache_key()|indent >>
<%- endcall %>

test:
needs: build
runs-on: ubuntu-latest

steps:
<<- restore_cache() >>

# Run the test

- name: Test
env:
EDGEDB_TEST_REPEATS: 1
run: |
edb test -j2 -v
workflow-notifications:
if: failure() && github.event_name != 'pull_request'
name: Notify in Slack on failures
needs:
- build
- test
runs-on: ubuntu-latest
permissions:
actions: 'read'
steps:
- name: Slack Workflow Notification
uses: Gamesight/slack-workflow-status@26a36836c887f260477432e4314ec3490a84f309
with:
repo_token: ${{secrets.GITHUB_TOKEN}}
slack_webhook_url: ${{secrets.ACTIONS_SLACK_WEBHOOK_URL}}
name: 'Workflow notifications'
icon_emoji: ':hammer:'
include_jobs: 'on-failure'
8 changes: 4 additions & 4 deletions .github/workflows.src/tests.inc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
id: ext-cache
with:
path: build/extensions
key: edb-ext-v5-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}
key: edb-ext-v6-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}

- name: Handle cached PostgreSQL build
uses: actions/cache@v4
Expand Down Expand Up @@ -123,7 +123,7 @@
steps.postgres-cache.outputs.cache-hit != 'true'
run: |
sudo apt-get update
sudo apt-get install -y uuid-dev libreadline-dev bison flex
sudo apt-get install -y uuid-dev libreadline-dev bison flex libprotobuf-c-dev
- name: Install Rust toolchain
if: |
Expand Down Expand Up @@ -195,7 +195,7 @@
if: steps.ext-cache.outputs.cache-hit != 'true'
with:
path: ${{ env.BUILD_TEMP }}/edb
key: edb-ext-build-v3-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}
key: edb-ext-build-v4-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}

- name: Build Cython extensions
env:
Expand Down Expand Up @@ -377,7 +377,7 @@
id: ext-cache
with:
path: build/extensions
key: edb-ext-v5-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}
key: edb-ext-v6-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}

- name: Restore compiled parsers cache
uses: actions/cache@v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests-ha.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions .github/workflows/tests-inplace.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions .github/workflows/tests-managed-pg.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions .github/workflows/tests-patches.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions .github/workflows/tests-pg-versions.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .github/workflows/tests-pool.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 26ad500

Please sign in to comment.