From 889a8720bf5d96cb5a15d99dc8f525f4e9ba7000 Mon Sep 17 00:00:00 2001
From: Andy Arthur <andy@dolthub.com>
Date: Fri, 30 Sep 2022 11:41:26 -0700
Subject: [PATCH] update Dolt CI to run all tests against both __DOLT__ and
 __LD_1__

---
 .github/workflows/ci-bats-unix.yaml           |  4 +-
 .../workflows/ci-dolt1-format-go-tests.yaml   | 38 -------------------
 .github/workflows/ci-go-race-enginetests.yaml |  2 +-
 .github/workflows/ci-go-tests.yaml            |  4 +-
 4 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 .github/workflows/ci-dolt1-format-go-tests.yaml

diff --git a/.github/workflows/ci-bats-unix.yaml b/.github/workflows/ci-bats-unix.yaml
index a98a87b9ec..4e16c6dd7e 100644
--- a/.github/workflows/ci-bats-unix.yaml
+++ b/.github/workflows/ci-bats-unix.yaml
@@ -22,10 +22,10 @@ jobs:
       fail-fast: true
       matrix:
         os: [ ubuntu-22.04, macos-latest ]
-        dolt_fmt: [ "", "__DOLT_DEV__", "__DOLT__" ]
+        dolt_fmt: [ "__DOLT__", "__DOLT_DEV__", "__LD_1__" ]
         exclude:
           - os: "macos-latest"
-            dolt_fmt: ["__DOLT_DEV__", "__DOLT__" ]
+            dolt_fmt: ["__DOLT_DEV__", "__LD_1__" ]
     env:
       use_credentials: ${{ secrets.AWS_SECRET_ACCESS_KEY != '' && secrets.AWS_ACCESS_KEY_ID != '' }}
     steps:
diff --git a/.github/workflows/ci-dolt1-format-go-tests.yaml b/.github/workflows/ci-dolt1-format-go-tests.yaml
deleted file mode 100644
index fd6911bd67..0000000000
--- a/.github/workflows/ci-dolt1-format-go-tests.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: __DOLT__ Enginetests
-
-on:
-  pull_request:
-    branches: [ main ]
-    paths:
-      - 'go/**'
-  workflow_dispatch:
-
-concurrency:
-  group: ci-dolt1-format-go-tests-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  test:
-    name: Go tests (new format)
-    defaults:
-      run:
-        shell: bash
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, ubuntu-22.04, windows-latest]
-    steps:
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v2
-      with:
-        go-version: ^1.19
-      id: go
-    - uses: actions/checkout@v2
-    - name: Test All with New Format
-      working-directory: ./go
-      run: |
-        go test -timeout 30m "./libraries/doltcore/sqle/enginetest/..."
-      env:
-        MATRIX_OS: ${{ matrix.os }}
-        DOLT_DEFAULT_BIN_FORMAT: "__DOLT__"
diff --git a/.github/workflows/ci-go-race-enginetests.yaml b/.github/workflows/ci-go-race-enginetests.yaml
index 7cc2e4b472..486090c822 100644
--- a/.github/workflows/ci-go-race-enginetests.yaml
+++ b/.github/workflows/ci-go-race-enginetests.yaml
@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-22.04 ]
-        dolt_fmt: [ "", "__DOLT_DEV__" ]
+        dolt_fmt: [ "__DOLT__", "__LD_1__", "__DOLT_DEV__" ]
     steps:
     - name: Set up Go 1.x
       uses: actions/setup-go@v2
diff --git a/.github/workflows/ci-go-tests.yaml b/.github/workflows/ci-go-tests.yaml
index 653088b270..184afbe408 100644
--- a/.github/workflows/ci-go-tests.yaml
+++ b/.github/workflows/ci-go-tests.yaml
@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, ubuntu-22.04, windows-latest]
-        dolt_fmt: [ "" ]
+        dolt_fmt: [ "__DOLT__", "__LD_1__" ]
         include:
           - os: "ubuntu-22.04"
             dolt_fmt: "__DOLT_DEV__"
@@ -74,7 +74,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, ubuntu-22.04, windows-latest]
-        dolt_fmt: [ "" ]
+        dolt_fmt: [ "__DOLT__", "__LD_1__" ]
         include:
           - os: "ubuntu-22.04"
             dolt_fmt: "__DOLT_DEV__"