From 359d413e1315cb3727805282453926c6217f13bc Mon Sep 17 00:00:00 2001
From: Daniel Bruce <djbruce@google.com>
Date: Tue, 3 Oct 2023 17:32:50 -0400
Subject: [PATCH] Add conformance to main CI pipeline instead

---
 .github/workflows/ci.yaml          | 18 ++++++++++++++
 .github/workflows/conformance.yaml | 40 ------------------------------
 2 files changed, 18 insertions(+), 40 deletions(-)
 delete mode 100644 .github/workflows/conformance.yaml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 711957bad..c2916478c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -58,3 +58,21 @@ jobs:
       - uses: JustinBeckwith/linkinator-action@v1
         with:
           paths: docs/
+  conformance:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/checkout@v3
+      with:
+        repository: googleapis/cloud-bigtable-clients-test
+        ref: main
+        path: cloud-bigtable-clients-test
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 14
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '>=1.20.2'
+    - run: npm install
+    - run: go version
+    - run: .kokoro/conformance.sh
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
deleted file mode 100644
index 36409aeb8..000000000
--- a/.github/workflows/conformance.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2023 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Github action job to test core java library features on
-# downstream client libraries before they are released.
-on:
-  push:
-    branches:
-    - main
-  pull_request:
-name: conformance
-jobs:
-  conformance:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/checkout@v3
-      with:
-        repository: googleapis/cloud-bigtable-clients-test
-        ref: main
-        path: cloud-bigtable-clients-test
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 14
-    - uses: actions/setup-go@v4
-      with:
-        go-version: '>=1.20.2'
-    - run: npm install
-    - run: go version
-    - run: .kokoro/conformance.sh