dgraph/23.0.0 package update

dgraph.yaml

@@ -1,8 +1,8 @@
 package:
   name: dgraph
-  version: 22.0.2
-  epoch: 1
-  description: The GitOps Toolkit Helm reconciler, for declarative Helming
+  version: 23.0.0
+  epoch: 0
+  description: A distributed graph database
   copyright:
     - license: Apache-2.0
 
@@ -19,7 +19,14 @@ pipeline:
     with:
       repository: https://github.com/dgraph-io/dgraph
       tag: v${{package.version}}
-      expected-commit: 7b18a6bec95731201d94142ec86a4fde035fb7e0
+      expected-commit: 38980bc4a44352094c15ddfe4b606a8f05b48e81
+
+  # CHECK-IF-VERSION-CHANGES: 23.0.0
+  # dgraph 23.0.0 failed to build from source due to missing enterprise edition stubs.
+  # See dgraph issue #8831.  Remove this patch in the next release.
+  - uses: patch
+    with:
+      patches: fix-compile.patch
 
   - runs: |
       make install_oss

dgraph/fix-compile.patch

@@ -0,0 +1,87 @@
+From ca15e0641cbca27ea1410f59e9facb68bd2f90fc Mon Sep 17 00:00:00 2001
+From: Aman Mangal <[email protected]>
+Date: Mon, 22 May 2023 14:44:54 -0400
+Subject: [PATCH] chore: fix failing oss build (#8832)
+
+fixes #8831
+---
+ .github/workflows/ci-dgraph-tests.yml |  3 +--
+ ee/acl/run.go                         | 12 ++++++++++++
+ ee/audit/run_ee_test.go               |  3 +++
+ systest/backup/common/utils.go        |  4 +++-
+ 4 files changed, 19 insertions(+), 3 deletions(-)
+
+diff --git a/.github/workflows/ci-dgraph-tests.yml b/.github/workflows/ci-dgraph-tests.yml
+index faca6ba01de..bd67bce77d4 100644
+--- a/.github/workflows/ci-dgraph-tests.yml
++++ b/.github/workflows/ci-dgraph-tests.yml
+@@ -81,10 +81,9 @@ jobs:
+           export GOPATH=~/go
+           # move the binary
+           cp dgraph/dgraph ~/go/bin/dgraph
+-          # run the tests
++          # run the unit and integration tests
+           cd t; ./t
+           # clean up docker containers after test execution
+           ./t -r
+           # sleep
+           sleep 5
+-          
+\ No newline at end of file
+diff --git a/ee/acl/run.go b/ee/acl/run.go
+index 617a3b30029..19109ee866d 100644
+--- a/ee/acl/run.go
++++ b/ee/acl/run.go
+@@ -22,6 +22,7 @@ package acl
+ import (
+ 	"github.com/spf13/cobra"
+
++	"github.com/dgraph-io/dgo/v210/protos/api"
+ 	"github.com/dgraph-io/dgraph/x"
+ )
+
+@@ -35,3 +36,14 @@ func init() {
+ 	}
+ 	CmdAcl.Cmd.SetHelpTemplate(x.NonRootTemplate)
+ }
++
++// CreateGroupNQuads cretes NQuads needed to store a group with the give ID.
++func CreateGroupNQuads(groupId string) []*api.NQuad {
++	return nil
++}
++
++// CreateUserNQuads creates the NQuads needed to store a user with the given ID and
++// password in the ACL system.
++func CreateUserNQuads(userId, password string) []*api.NQuad {
++	return nil
++}
+diff --git a/ee/audit/run_ee_test.go b/ee/audit/run_ee_test.go
+index ff993606075..723cdf1c260 100644
+--- a/ee/audit/run_ee_test.go
++++ b/ee/audit/run_ee_test.go
+@@ -1,3 +1,6 @@
++//go:build !oss
++// +build !oss
++
+ /*
+  * Copyright 2023 Dgraph Labs, Inc. and Contributors
+  *
+diff --git a/systest/backup/common/utils.go b/systest/backup/common/utils.go
+index 205660e041b..cab1b54004c 100644
+--- a/systest/backup/common/utils.go
++++ b/systest/backup/common/utils.go
+@@ -1,3 +1,6 @@
++//go:build !oss
++// +build !oss
++
+ /*
+  * Copyright 2023 Dgraph Labs, Inc. and Contributors *
+  * Licensed under the Apache License, Version 2.0 (the "License");
+@@ -124,7 +127,6 @@ func AddItemSchema(t *testing.T, header http.Header, whichAlpha string) {
+ }
+
+ func AddItem(t *testing.T, minSuffixVal int, maxSuffixVal int, jwtToken string, whichAlpha string) {
+-
+ 	query := `mutation addItem($name: String!, $price: String!){
+ 		addItem(input: [{ name: $name, price: $price}]) {
+ 		  item {