Skip to content

Commit dd6ab39

Browse files
authored
Merge branch 'develop' into ple-stable-into-develop
2 parents aedb4ac + 03c534d commit dd6ab39

File tree

925 files changed

+27005
-5474
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

925 files changed

+27005
-5474
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ COPY . .
3434

3535
USER vscode
3636

37-
RUN pip install toml invoke
37+
RUN pip install invoke
3838

3939
RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=2.1.3 python3 - \
4040
&& echo "export PATH=\"$HOME/.local/bin:$PATH\"" >> $HOME/.bashrc

.github/workflows/chromatic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
with:
2525
fetch-depth: 0 # In order for Chromatic to correctly determine baseline commits, tot access the full Git history graph.
2626
- name: Install Node.js
27-
uses: actions/setup-node@v4
27+
uses: actions/setup-node@v5
2828
with:
2929
node-version: 22
3030
cache: 'npm'

.github/workflows/ci.yml

Lines changed: 65 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
- name: "Check out repository code"
9191
uses: "actions/checkout@v5"
9292
- name: Setup Node.js
93-
uses: actions/setup-node@v4
93+
uses: actions/setup-node@v5
9494
with:
9595
node-version: 22
9696
cache: 'npm'
@@ -420,7 +420,7 @@ jobs:
420420
echo INFRAHUB_TESTING_IMAGE_VER=local-${{ runner.name }}-${{ github.sha }} >> $GITHUB_ENV
421421
echo INFRAHUB_TESTING_DOCKER_IMAGE="opsmill/infrahub" >> $GITHUB_ENV
422422
- name: Install Invoke
423-
run: pip install invoke toml
423+
run: pip install invoke
424424
- name: "Build container"
425425
run: "invoke dev.build"
426426
- name: "Setup Python environment"
@@ -535,7 +535,7 @@ jobs:
535535
with:
536536
submodules: true
537537
- name: Install NodeJS
538-
uses: actions/setup-node@v4
538+
uses: actions/setup-node@v5
539539
with:
540540
node-version: 22
541541
cache: 'npm'
@@ -559,6 +559,63 @@ jobs:
559559
parallel: true
560560
file: frontend/app/coverage/lcov.info
561561

562+
graphql-schema:
563+
if: |
564+
always() && !cancelled() &&
565+
!contains(needs.*.result, 'failure') &&
566+
!contains(needs.*.result, 'cancelled') &&
567+
needs.files-changed.outputs.backend == 'true'
568+
needs: ["prepare-environment", "files-changed", "yaml-lint", "python-lint"]
569+
runs-on:
570+
group: huge-runners
571+
steps:
572+
- name: Check out repository code
573+
uses: actions/checkout@v4
574+
- name: Set up Python
575+
id: python
576+
uses: actions/setup-python@v6
577+
with:
578+
python-version: 3.12
579+
- name: "Setup environment"
580+
run: |
581+
pipx install -f poetry==${{ needs.prepare-environment.outputs.POETRY_VERSION }}
582+
poetry config virtualenvs.create true --local
583+
poetry env use 3.12
584+
poetry run pip install invoke toml
585+
env:
586+
PIPX_DEFAULT_PYTHON: ${{ steps.python.outputs.python-path }}
587+
- name: "Install Package"
588+
run: "poetry install"
589+
590+
- name: Install NodeJS
591+
uses: actions/setup-node@v4
592+
with:
593+
node-version: 20
594+
cache: 'npm'
595+
cache-dependency-path: ./schema/package-lock.json
596+
- name: "Install format-graphql"
597+
working-directory: schema
598+
run: npm install
599+
600+
- name: Select infrahub db port
601+
run: echo "INFRAHUB_DB_PORT=$(shuf -n 1 -i 10000-60000)" >> $GITHUB_ENV
602+
603+
- name: "Set environment variables"
604+
run: echo INFRAHUB_BUILD_NAME=infrahub-${{ runner.name }} >> $GITHUB_ENV
605+
- name: "Set environment variables"
606+
run: echo INFRAHUB_IMAGE_VER=local-${{ runner.name }}-${{ github.sha }} >> $GITHUB_ENV
607+
- name: "Clear docker environment"
608+
run: docker compose -p $INFRAHUB_BUILD_NAME down -v --remove-orphans --rmi local
609+
610+
- name: Create docker compose override
611+
run: mv development/docker-compose.dev-override-benchmark.yml development/docker-compose.dev-override.yml
612+
613+
- name: Start dependencies
614+
run: poetry run invoke dev.build dev.deps
615+
616+
- name: Run validation
617+
run: poetry run invoke schema.validate-graphqlschema
618+
562619
documentation:
563620
defaults:
564621
run:
@@ -577,7 +634,7 @@ jobs:
577634
with:
578635
submodules: true
579636
- name: Install NodeJS
580-
uses: actions/setup-node@v4
637+
uses: actions/setup-node@v5
581638
with:
582639
node-version: 22
583640
cache: 'npm'
@@ -617,7 +674,7 @@ jobs:
617674
with:
618675
submodules: true
619676
- name: Install NodeJS
620-
uses: actions/setup-node@v4
677+
uses: actions/setup-node@v5
621678
with:
622679
node-version: 22
623680
cache: 'npm'
@@ -735,7 +792,7 @@ jobs:
735792
with:
736793
submodules: true
737794
- name: Install NodeJS
738-
uses: actions/setup-node@v4
795+
uses: actions/setup-node@v5
739796
with:
740797
node-version: 22
741798
cache: 'npm'
@@ -747,7 +804,7 @@ jobs:
747804
python-version: 3.12
748805

749806
- name: Install Invoke
750-
run: pip install invoke toml
807+
run: pip install invoke
751808

752809
- name: Set job name
753810
run: echo JOB_NAME="$GITHUB_JOB" >> $GITHUB_ENV
@@ -921,7 +978,7 @@ jobs:
921978

922979
- name: Install Invoke
923980
run: |
924-
pip install invoke toml
981+
pip install invoke
925982
926983
- name: Set job name
927984
run: echo JOB_NAME="$GITHUB_JOB" >> $GITHUB_ENV

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
pull-requests: write
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/labeler@v5.0.0
15+
- uses: actions/labeler@v6.0.1
1616
with:
1717
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1818
sync-labels: true

.github/workflows/repository-dispatch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
uses: actions/checkout@v5
4747

4848
- name: Repository Dispatch
49-
uses: peter-evans/repository-dispatch@v3
49+
uses: peter-evans/repository-dispatch@v4
5050
with:
5151
token: ${{ secrets.GH_UPDATE_PACKAGE_OTTO }}
5252
# if matrix.repo contains a slash, use it literally; otherwise look up the secret named by matrix.repo

.github/workflows/version-upgrade.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
commit:
99
type: string
1010
description: commit sha or branch name
11-
default: ''
11+
default: ""
1212
required: false
1313

1414
env:
@@ -64,7 +64,7 @@ jobs:
6464
run: |
6565
pipx install -f poetry==${{ env.POETRY_VERSION }}
6666
poetry config virtualenvs.create true --local
67-
pip install invoke toml
67+
pip install invoke
6868
- name: "Install Package"
6969
run: "poetry install"
7070
- name: "Set environment variables"
@@ -76,7 +76,7 @@ jobs:
7676
- name: "Store start time"
7777
run: echo TEST_START_TIME=$(date +%s)000 >> $GITHUB_ENV
7878

79-
# Initialize the demo environment with the Source Version
79+
# Initialize the demo environment with the Source Version
8080
- name: Pull External Docker Images
8181
run: invoke demo.pull
8282
env:
@@ -117,7 +117,7 @@ jobs:
117117
- name: Stop Demo
118118
run: invoke demo.stop
119119

120-
# Build the local version and run the migrations
120+
# Build the local version and run the migrations
121121
- name: "Set environment variables"
122122
run: |
123123
echo INFRAHUB_IMAGE_VER=local-${{ runner.name }}-${{ github.sha }} >> $GITHUB_ENV

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,5 @@ helm/Chart.lock
4545

4646
python_testcontainers/dist/*
4747
python_testcontainers/infrahub_testcontainers.egg-info/*
48+
49+
schema/node_modules/*

.vale/styles/spelling-exceptions.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ deserialized
5151
dev
5252
devcontainer
5353
direnv
54+
display_label
5455
display_labels
5556
docker
5657
dockerfile
@@ -64,6 +65,8 @@ enums
6465
env
6566
eslint
6667
excalidraw
68+
execute_in_proposed_change
69+
execute_after_merge
6770
failover
6871
fanout
6972
file_path

0 commit comments

Comments
 (0)