Merge branch 'main' into harshil-goel/mutation-pipeline

Author: matthewmcneely

.github/CODEOWNERS

@@ -1,4 +1,4 @@
 # CODEOWNERS info: https://help.github.com/en/articles/about-code-owners
 # Owners are automatically requested for review for PRs that changes code
 # that they own.
-* @hypermodeinc/database
+* @dgraph-io/maintainers

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Dgraph Community Support
-    url: https://discord.hypermode.com
+  - name: Dgraph Community
+    url: https://github.com/dgraph-io/dgraph/discussions
     about: Please ask and answer questions here

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,17 +4,25 @@ Please explain the changes you made here.
 
 **Checklist**
 
-- [ ] Code compiles correctly and linting passes locally
-- [ ] For all _code_ changes, an entry added to the `CHANGELOG.md` file describing and linking to
-      this PR
+- [ ] The PR title follows the
+      [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary) syntax, leading
+      with `fix:`, `feat:`, `chore:`, `ci:`, etc.
+- [ ] Code compiles correctly and linting (via trunk) passes locally
 - [ ] Tests added for new functionality, or regression tests for bug fixes added as applicable
-- [ ] For public APIs, new features, etc., PR on
-      [docs repo](https://github.com/hypermodeinc/docs) staged and linked here
+- [ ] For public APIs, new features, etc., a PR on the
+      [docs repo](https://github.com/dgraph-io/dgraph-docs) staged and linked here. This process can
+      be simplified by going to the [public docs site](https://docs.dgraph.io/) and clicking the
+      "Edit this page" button at the bottom of page(s) relevant to your changes. Ensure that you
+      indicate in the PR that this is an **unreleased** feature so that it does not get merged into
+      the main docs prematurely.
 
 **Instructions**
 
-- The PR title should follow the [Conventional Commits](https://www.conventionalcommits.org/)
-  syntax, leading with `fix:`, `feat:`, `chore:`, `ci:`, etc.
+- The PR title should follow the
+  [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary) syntax, leading
+  with `fix:`, `feat:`, `chore:`, `ci:`, etc. Ensure any breaking changes are appropriately marked
+  with a `!`. For instance, `feat(dql)!: Remove the foobar func` would indicate that this is a
+  breaking change to the DQL syntax.
 - The description should briefly explain what the PR is about. In the case of a bugfix, describe or
   link to the bug.
 - In the checklist section, check the boxes in that are applicable, using `[x]` syntax.

.github/actionlint.yaml

@@ -0,0 +1,27 @@
+self-hosted-runner:
+  # Define custom labels for Blacksmith runners
+  # Ubuntu 24.04 x64 runners
+  labels:
+    - blacksmith-2vcpu-ubuntu-2404
+    - blacksmith-4vcpu-ubuntu-2404
+    - blacksmith-8vcpu-ubuntu-2404
+    - blacksmith-16vcpu-ubuntu-2404
+    - blacksmith-32vcpu-ubuntu-2404
+    # Ubuntu 24.04 ARM runners
+    - blacksmith-2vcpu-ubuntu-2404-arm
+    - blacksmith-4vcpu-ubuntu-2404-arm
+    - blacksmith-8vcpu-ubuntu-2404-arm
+    - blacksmith-16vcpu-ubuntu-2404-arm
+    - blacksmith-32vcpu-ubuntu-2404-arm
+    # Ubuntu 22.04 x64 runners
+    - blacksmith-2vcpu-ubuntu-2204
+    - blacksmith-4vcpu-ubuntu-2204
+    - blacksmith-8vcpu-ubuntu-2204
+    - blacksmith-16vcpu-ubuntu-2204
+    - blacksmith-32vcpu-ubuntu-2204
+    # Ubuntu 22.04 ARM runners
+    - blacksmith-2vcpu-ubuntu-2204-arm
+    - blacksmith-4vcpu-ubuntu-2204-arm
+    - blacksmith-8vcpu-ubuntu-2204-arm
+    - blacksmith-16vcpu-ubuntu-2204-arm
+    - blacksmith-32vcpu-ubuntu-2204-arm

.github/actionlint.yml

@@ -1,6 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["github>hypermodeinc/renovate-config"],
+  "extends": ["github>dgraph-io/renovate-config"],
   "rangeStrategy": "widen",
   "ignorePaths": ["contrib/**"],
   "baseBranches": ["main", "release/v24.1"],

.github/renovate.json

@@ -10,9 +10,11 @@ permissions:
 
 jobs:
   build:
-    runs-on: warp-ubuntu-latest-x64-4x
+    if: false # Temporarily disabled
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
-      - uses: docker/[email protected]
+      - name: Setup Blacksmith Builder
+        uses: useblacksmith/setup-docker-builder@v1
 
       - name: Log in to GitHub Container Registry
         uses: docker/[email protected]
@@ -22,8 +24,8 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v6.18.0
+        uses: useblacksmith/build-push-action@v2
         with:
           push: true
           platforms: linux/amd64,linux/arm64
-          tags: ghcr.io/hypermodeinc/dgraph-standalone:nightly
+          tags: ghcr.io/dgraph-io/dgraph-standalone:nightly

.github/workflows/cd-dgraph-nightly.yml

@@ -17,18 +17,18 @@ on:
         description: if checked, images will be pushed to dgraph-custom repo in Dockerhub
 
 permissions:
-  contents: read
+  contents: write
 
 jobs:
   dgraph-build-amd64:
-    runs-on: warp-ubuntu-latest-x64-4x
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v5
         with:
           ref: "${{ github.event.inputs.releasetag }}"
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
       - name: Install protobuf-compiler
@@ -81,12 +81,6 @@ jobs:
             badger/badger-linux-amd64.tar.gz
             dgraph/dgraph-checksum-linux-amd64.sha256
             dgraph/dgraph-linux-amd64.tar.gz
-      - name: Move Badger Binary into Linux Directory
-        run: |
-          tar -xzf badger/badger-linux-amd64.tar.gz --directory badger
-          [ -d "linux" ] || mkdir linux
-          # linux directory will be added to docker image in build step
-          cp badger/badger-linux-amd64 linux/badger
       - name: Make Dgraph Docker Image
         run: |
           set -e
@@ -121,14 +115,14 @@ jobs:
           path: dgraph-standalone-amd64.tar
 
   dgraph-build-arm64:
-    runs-on: warp-ubuntu-latest-arm64-4x
+    runs-on: blacksmith-4vcpu-ubuntu-2404-arm
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v5
         with:
           ref: "${{ github.event.inputs.releasetag }}"
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
       - name: Install protobuf-compiler
@@ -181,12 +175,6 @@ jobs:
             badger/badger-linux-arm64.tar.gz
             dgraph/dgraph-checksum-linux-arm64.sha256
             dgraph/dgraph-linux-arm64.tar.gz
-      - name: Move Badger Binary into Linux Directory
-        run: |
-          tar -xzf badger/badger-linux-arm64.tar.gz --directory badger
-          [ -d "linux" ] || mkdir linux
-          # linux directory will be added to docker image in build step
-          cp badger/badger-linux-arm64 linux/badger
       - name: Make Dgraph Docker Image
         run: |
           set -e
@@ -222,7 +210,7 @@ jobs:
 
   graph-docker-image-and-manifests-push:
     needs: [dgraph-build-amd64, dgraph-build-arm64]
-    runs-on: warp-ubuntu-latest-x64-4x
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v5
@@ -260,6 +248,20 @@ jobs:
         with:
           name: dgraph-docker-arm64
 
+      # Download Dgraph Linux AMD64 Binary Artifacts
+      - name: Download Dgraph Linux AMD64 Binary Artifacts
+        uses: actions/download-artifact@v5
+        with:
+          name: dgraph-amd-release-artifacts
+          path: dgraph-amd-release-artifacts
+
+      # Download Dgraph Linux ARM64 Binary Artifacts
+      - name: Download Dgraph Linux ARM64 Binary Artifacts
+        uses: actions/download-artifact@v5
+        with:
+          name: dgraph-arm-release-artifacts
+          path: dgraph-arm-release-artifacts
+
       # Load Dgraph AMD64 Image
       - name: Load AMD64 Docker Image
         run: |
@@ -325,3 +327,18 @@ jobs:
                docker manifest push dgraph/dgraph:latest
             fi
           fi
+
+      - name: Upload Assets to Release
+        if: github.event.inputs.custom-build == 'false'
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ github.event.inputs.releasetag }}
+          files: |
+            dgraph-amd-release-artifacts/dgraph/dgraph-linux-amd64.tar.gz
+            dgraph-amd-release-artifacts/dgraph/dgraph-checksum-linux-amd64.sha256
+            dgraph-amd-release-artifacts/badger/badger-linux-amd64.tar.gz
+            dgraph-amd-release-artifacts/badger/badger-checksum-linux-amd64.sha256
+            dgraph-arm-release-artifacts/dgraph/dgraph-linux-arm64.tar.gz
+            dgraph-arm-release-artifacts/dgraph/dgraph-checksum-linux-arm64.sha256
+            dgraph-arm-release-artifacts/badger/badger-linux-arm64.tar.gz
+            dgraph-arm-release-artifacts/badger/badger-checksum-linux-arm64.sha256

.github/workflows/cd-dgraph.yml

@@ -0,0 +1,73 @@
+name: Check File Changes
+
+on:
+  workflow_call:
+    inputs:
+      skip-extensions:
+        description: Space-separated list of file extensions that should skip tests
+        required: false
+        type: string
+        default: md mdc txt rst png jpg jpeg gif svg ico pdf
+    outputs:
+      should-skip:
+        description: Whether the workflow should skip (only skippable files changed)
+        value: ${{ jobs.check-changes.outputs.should-skip }}
+
+permissions:
+  contents: read
+
+jobs:
+  check-changes:
+    runs-on: ubuntu-latest
+    outputs:
+      should-skip: ${{ steps.check.outputs.should-skip }}
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Check if only skippable files changed
+        id: check
+        run: |
+          # Use input parameter or default
+          SKIP_EXTENSIONS="${{ inputs.skip-extensions }}"
+
+          if [ "${{ github.event_name }}" == "schedule" ] || [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
+            echo "Triggered by schedule or manual dispatch, running full tests"
+            echo "should-skip=false" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          # Get the list of changed files
+          git fetch origin ${{ github.base_ref }}
+          CHANGED_FILES=$(git diff --name-only origin/${{ github.base_ref }}...HEAD)
+
+          # Check if we have any changes
+          if [ -z "$CHANGED_FILES" ]; then
+            echo "No files changed, running tests"
+            echo "should-skip=false" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          # Build regex pattern from extensions (e.g., \.(md|txt|png)$)
+          PATTERN=$(echo "$SKIP_EXTENSIONS" | sed 's/ /|/g')
+          REGEX="\.($PATTERN)$"
+
+          # Check if all changes match skippable extensions
+          NON_SKIPPABLE_FILES=$(echo "$CHANGED_FILES" | grep -Ev "$REGEX" || true)
+
+          if [ -z "$NON_SKIPPABLE_FILES" ]; then
+            echo "Only skippable files changed (extensions: $SKIP_EXTENSIONS), skipping tests"
+            echo "should-skip=true" >> $GITHUB_OUTPUT
+          else
+            echo "Non-skippable files changed, running tests"
+            echo "should-skip=false" >> $GITHUB_OUTPUT
+          fi
+
+  skip-job:
+    needs: check-changes
+    if: needs.check-changes.outputs.should-skip == 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Skip tests
+        run: echo "Only documentation/assets changed, skipping tests"

.github/workflows/check-changes.yml

@@ -2,12 +2,6 @@ name: ci-dgraph-core-tests
 
 on:
   pull_request:
-    paths:
-      - "**/*.go"
-      - "**/go.mod"
-      - "**/*.yml"
-      - "**/Dockerfile"
-      - "**/Makefile"
     types:
       - opened
       - reopened
@@ -23,40 +17,53 @@ permissions:
   contents: read
 
 jobs:
+  check-changes:
+    uses: ./.github/workflows/check-changes.yml
+
   dgraph-core-tests:
-    if: github.event.pull_request.draft == false
-    runs-on: warp-ubuntu-latest-x64-16x
+    needs: check-changes
+    if:
+      github.event.pull_request.draft == false && needs.check-changes.outputs.should-skip != 'true'
+    runs-on: blacksmith-8vcpu-ubuntu-2404
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v5
+
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
+
       - name: Install protobuf-compiler
         run: sudo apt update && sudo apt install -y protobuf-compiler
+
       - name: Install gotestsum
         run: go install gotest.tools/gotestsum@latest
+
       - name: Check protobuf
         run: |
           cd ./protos
           go mod tidy
           make regenerate
           git diff -b --exit-code -- .
+
       - name: Make Linux Build and Docker Image
         run: make docker-image
+
       - name: Build Test Binary
         run: |
           #!/bin/bash
           # build the test binary
           cd t; go build .
+
       - name: Clean Up Environment
         run: |
           #!/bin/bash
           # clean cache
           go clean -testcache
           # clean up docker containers before test execution
           cd t; ./t -r
+
       - name: Run Core Tests
         run: |
           #!/bin/bash
@@ -76,5 +83,5 @@ jobs:
         uses: trunk-io/analytics-uploader@v2
         with:
           junit-paths: ./test-results.xml
-          org-slug: hypermode
+          org-slug: dgraph-io
           token: ${{ secrets.TRUNK_TOKEN }}