Skip to content

Commit f07c225

Browse files
Harshil Goelryanfoxtyler
andauthored
fix(core):change delete-on-update to remove-on-update and set default (#9329)
#9305 #9307 #9319 --------- Co-authored-by: Ryan Fox-Tyler <[email protected]>
1 parent 138715c commit f07c225

Some content is hidden

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

41 files changed

+177
-155
lines changed

.github/renovate.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": ["github>hypermodeinc/renovate-config"],
4+
"rangeStrategy": "widen",
45
"ignorePaths": ["contrib/**"]
56
}

.github/workflows/cd-dgraph.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ permissions:
2121

2222
jobs:
2323
dgraph-build-amd64:
24-
runs-on: warp-ubuntu-latest-x64-16x
24+
runs-on: warp-ubuntu-latest-x64-4x
2525
timeout-minutes: 15
2626
steps:
2727
- uses: actions/checkout@v4
@@ -121,7 +121,7 @@ jobs:
121121
path: dgraph-standalone-amd64.tar
122122

123123
dgraph-build-arm64:
124-
runs-on: warp-ubuntu-latest-arm64-16x
124+
runs-on: warp-ubuntu-latest-arm64-4x
125125
timeout-minutes: 15
126126
steps:
127127
- uses: actions/checkout@v4
@@ -156,7 +156,7 @@ jobs:
156156
run: |
157157
#!/bin/bash
158158
GIT_TAG_NAME='${{ github.event.inputs.releasetag }}'
159-
if [[ "$GIT_TAG_NAME" == "v"* ]];
159+
if [[ "$GIT_TAG_NAME" == "v"* ]];
160160
then
161161
echo "this is a release branch"
162162
else
@@ -222,7 +222,7 @@ jobs:
222222

223223
graph-docker-image-and-manifests-push:
224224
needs: [dgraph-build-amd64, dgraph-build-arm64]
225-
runs-on: warp-ubuntu-latest-x64-16x
225+
runs-on: warp-ubuntu-latest-x64-4x
226226
timeout-minutes: 15
227227
steps:
228228
- uses: actions/checkout@v4
@@ -232,7 +232,7 @@ jobs:
232232
run: |
233233
#!/bin/bash
234234
GIT_TAG_NAME='${{ github.event.inputs.releasetag }}'
235-
if [[ "$GIT_TAG_NAME" == "v"* ]];
235+
if [[ "$GIT_TAG_NAME" == "v"* ]];
236236
then
237237
echo "this is a release branch"
238238
else

.github/workflows/ci-dgraph-core-upgrade-tests.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,13 @@ jobs:
4545
#!/bin/bash
4646
# go env settings
4747
export GOPATH=~/go
48-
export DGRAPH_UPGRADE_MAIN_ONLY=true
4948
# move the binary
5049
cp dgraph/dgraph ~/go/bin/dgraph
5150
# run the core upgrade tests
52-
go test -tags=upgrade \
53-
github.com/hypermodeinc/dgraph/v24/ee/acl \
54-
github.com/hypermodeinc/dgraph/v24/worker \
55-
github.com/hypermodeinc/dgraph/v24/query \
56-
-v -timeout=120m -failfast
51+
go test -v -timeout=120m -failfast -tags=upgrade \
52+
github.com/hypermodeinc/dgraph/v24/ee/acl \
53+
github.com/hypermodeinc/dgraph/v24/worker \
54+
github.com/hypermodeinc/dgraph/v24/query
5755
# clean up docker containers after test execution
5856
go clean -testcache
5957
# sleep

.github/workflows/ci-dgraph-fuzz.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ jobs:
3636
#!/bin/bash
3737
# go env settings
3838
export GOPATH=~/go
39-
go test ./dql -fuzz="Fuzz" -fuzztime="300s" -fuzzminimizetime="120s"
39+
go test -v ./dql -fuzz="Fuzz" -fuzztime="300s" -fuzzminimizetime="120s"

.github/workflows/ci-dgraph-jepsen-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Checkout jepsen repo
2121
uses: actions/checkout@v4
2222
with:
23-
repository: dgraph-io/jepsen
23+
repository: hypermodeinc/jepsen
2424
path: jepsen
2525
ref: master
2626
- name: Set jepsen root

.github/workflows/ci-dgraph-oss-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ jobs:
4141
# move the binary
4242
cp dgraph/dgraph ~/go/bin/dgraph
4343
# run OSS unit tests
44-
go test -timeout=60m -failfast -tags=oss -count=1 ./...
44+
go test -v -timeout=60m -failfast -tags=oss -count=1 ./...

.github/workflows/ci-dgraph-system-upgrade-tests.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
dgraph-upgrade-tests:
2525
if: github.event.pull_request.draft == false
2626
runs-on: warp-ubuntu-latest-x64-4x
27-
timeout-minutes: 60
27+
timeout-minutes: 90
2828
steps:
2929
- uses: actions/checkout@v4
3030
with:
@@ -45,15 +45,14 @@ jobs:
4545
#!/bin/bash
4646
# go env settings
4747
export GOPATH=~/go
48-
export DGRAPH_UPGRADE_MAIN_ONLY=true
4948
# move the binary
5049
cp dgraph/dgraph ~/go/bin/dgraph
5150
# run the sytem upgrade tests
52-
go test -tags=upgrade github.com/hypermodeinc/dgraph/v24/systest/mutations-and-queries \
53-
github.com/hypermodeinc/dgraph/v24/systest/plugin \
54-
github.com/hypermodeinc/dgraph/v24/systest/license \
55-
github.com/hypermodeinc/dgraph/v24/systest/multi-tenancy \
56-
-v -timeout=120m -failfast
51+
go test -v -timeout=120m -failfast -tags=upgrade \
52+
github.com/hypermodeinc/dgraph/v24/systest/mutations-and-queries \
53+
github.com/hypermodeinc/dgraph/v24/systest/plugin \
54+
github.com/hypermodeinc/dgraph/v24/systest/license \
55+
github.com/hypermodeinc/dgraph/v24/systest/multi-tenancy
5756
# clean up docker containers after test execution
5857
go clean -testcache
5958
# sleep

.github/workflows/ci-dgraph-systest-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ permissions:
2525
jobs:
2626
dgraph-systest-tests:
2727
if: github.event.pull_request.draft == false
28-
runs-on: warp-ubuntu-latest-x64-4x
28+
runs-on: warp-ubuntu-latest-x64-16x
2929
timeout-minutes: 60
3030
steps:
3131
- uses: actions/checkout@v4

.github/workflows/ci-dgraph-upgrade-fixed-versions-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
#!/bin/bash
3232
# go env settings
3333
export GOPATH=~/go
34+
export DGRAPH_UPGRADE_MAIN_ONLY=false
3435
# move the binary
3536
cp dgraph/dgraph ~/go/bin/dgraph
3637
# run the tests

.trunk/trunk.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ plugins:
1414
# Many linters and tools depend on runtimes - configure them here. (https://docs.trunk.io/runtimes)
1515
runtimes:
1616
enabled:
17-
17+
1818
1919
2020

0 commit comments

Comments
 (0)