Skip to content

Commit 102ef06

Browse files
Merge remote-tracking branch 'upstream/dev' into remove-dojo-async-task-base-task
# Conflicts: # dojo/importers/base_importer.py # dojo/product/helpers.py # dojo/tags_signals.py # dojo/utils.py
2 parents aed091b + 8dd3cd2 commit 102ef06

627 files changed

Lines changed: 112481 additions & 5257 deletions

File tree

Some content is hidden

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

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
node-version: '24.13.0' # TODO: Renovate helper might not be needed here - needs to be fully tested
2828

2929
- name: Cache dependencies
30-
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
30+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
3131
with:
3232
path: ~/.npm
3333
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

.github/workflows/integration-tests.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,16 @@ jobs:
4141
"tests/notifications_test.py",
4242
"tests/tool_config.py",
4343
"openapi-validatator",
44-
4544
]
4645
os: [alpine, debian]
46+
v3_feature_locations: [true, false]
47+
exclude:
48+
# standalone create endpoint page is gone in v3
49+
- v3_feature_locations: true
50+
test-case: "tests/endpoint_test.py"
4751
fail-fast: false
52+
env:
53+
DD_V3_FEATURE_LOCATIONS: ${{ matrix.v3_feature_locations }}
4854

4955
steps:
5056
- name: Checkout

.github/workflows/k8s-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Setup Minikube
2828
uses: manusa/actions-setup-minikube@b589f2d61bf96695c546929c72b38563e856059d # v2.14.0
2929
with:
30-
minikube version: 'v1.37.0' # renovate: datasource=github-releases depName=kubernetes/minikube
30+
minikube version: 'v1.38.0' # renovate: datasource=github-releases depName=kubernetes/minikube
3131
kubernetes version: ${{ matrix.k8s }}
3232
driver: docker
3333
start args: '--addons=ingress --cni calico'

.github/workflows/release-x-manual-docker-containers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
run: echo "DOCKER_ORG=$(echo ${GITHUB_REPOSITORY%%/*} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
5353

5454
- name: Login to DockerHub
55-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
55+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
5656
with:
5757
username: ${{ secrets.DOCKERHUB_USERNAME }}
5858
password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/release-x-manual-merge-container-digests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
merge-multiple: true
4949

5050
- name: Login to DockerHub
51-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
51+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
5252
with:
5353
username: ${{ secrets.DOCKERHUB_USERNAME }}
5454
password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/release-x-manual-tag-as-latest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: echo "DOCKER_ORG=$(echo ${GITHUB_REPOSITORY%%/*} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
3838

3939
- name: Login to DockerHub
40-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
40+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
4141
with:
4242
username: ${{ secrets.DOCKERHUB_USERNAME }}
4343
password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/renovate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
uses: suzuki-shunsuke/github-action-renovate-config-validator@ca480cb7ec89a9e1cd8c214ad33bda1617184027 # v2.0.0
2222
with:
2323
strict: "true"
24-
validator_version: 42.92.5 # renovate: datasource=github-releases depName=renovatebot/renovate
24+
validator_version: 43.2.4 # renovate: datasource=github-releases depName=renovatebot/renovate

.github/workflows/rest-framework-tests.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ on:
66
platform:
77
type: string
88
default: "linux/amd64"
9+
v3_feature_locations:
10+
type: boolean
11+
default: false
912

1013
jobs:
1114
unit_tests:
1215
name: Rest Framework Unit Tests
1316
runs-on: ${{ inputs.platform == 'linux/arm64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
14-
1517
strategy:
1618
matrix:
1719
os: [alpine, debian]
@@ -53,10 +55,11 @@ jobs:
5355

5456
# no celery or initializer needed for unit tests
5557
- name: Unit tests
56-
timeout-minutes: 20
58+
timeout-minutes: 25
5759
run: docker compose up --no-deps --exit-code-from uwsgi uwsgi
5860
env:
5961
DJANGO_VERSION: ${{ matrix.os }}
62+
DD_V3_FEATURE_LOCATIONS: ${{ inputs.v3_feature_locations }}
6063

6164
- name: Logs
6265
if: failure()

.github/workflows/unit-tests.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,16 @@ jobs:
2323

2424
test-rest-framework:
2525
strategy:
26-
matrix:
27-
platform: ['linux/amd64', 'linux/arm64']
28-
fail-fast: false
26+
matrix:
27+
platform: ['linux/amd64', 'linux/arm64']
28+
v3_feature_locations: [ false, true ]
29+
fail-fast: false
2930
needs: build-docker-containers
3031
uses: ./.github/workflows/rest-framework-tests.yml
3132
secrets: inherit
3233
with:
33-
platform: ${{ matrix.platform}}
34+
platform: ${{ matrix.platform }}
35+
v3_feature_locations: ${{ matrix.v3_feature_locations }}
3436

3537
# only run integration tests for linux/amd64 (default)
3638
test-user-interface:

.github/workflows/validate_docs_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
node-version: '24.13.0' # TODO: Renovate helper might not be needed here - needs to be fully tested
2323

2424
- name: Cache dependencies
25-
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
25+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
2626
with:
2727
path: ~/.npm
2828
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

0 commit comments

Comments
 (0)