From 910b180f6710d100b3e7f111d8341bc1632fa1f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Zwoli=C5=84ski?= <mac.zwolinski@gmail.com>
Date: Tue, 9 Jan 2024 14:20:13 +0100
Subject: [PATCH] chore: remove build and align compile-protos

---
 .github/workflows/build.yml | 67 +++++++++++++++----------------------
 1 file changed, 27 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eaf9c9ab1..a07d4c054 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,6 +9,33 @@ on:
     branches:
       - 'v*.*.*-celestia'
 jobs:
+  # As per https://github.com/informalsystems/tendermint-rs/issues/1014
+  generated-protos-compile:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+
+      - name: Install protoc
+        run: |
+          curl -Lo /tmp/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v21.4/protoc-21.4-linux-x86_64.zip
+          unzip /tmp/protoc.zip -d ${HOME}/.local
+          echo "PROTOC=${HOME}/.local/bin/protoc" >> $GITHUB_ENV
+          export PATH="${PATH}:${HOME}/.local/bin"
+
+      - name: Install buf
+        run: |
+          curl -sSL https://github.com/bufbuild/buf/releases/download/v1.15.1/buf-Linux-x86_64 \
+            -o /usr/local/bin/buf
+          chmod +x /usr/local/bin/buf
+
+      - name: Regenerate proto definitions
+        working-directory: ./tools/proto-compiler/
+        run: cargo run
+
+      - name: Ensure that generated proto builds
+        run: cargo build
+
   # cleanup-runs:
   #   runs-on: ubuntu-latest
   #   steps:
@@ -17,18 +44,6 @@ jobs:
   #         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
   #   if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
 
-  tendermint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: build-all
-
   # build-light-client-wasm:
   #   runs-on: ubuntu-latest
   #   steps:
@@ -56,31 +71,3 @@ jobs:
   #     - uses: actions-rs/cargo@v1
   #       with:
   #         command: build-tools
-
-  # As per https://github.com/informalsystems/tendermint-rs/issues/1014
-  generated-protos-compile:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-      - name: Install protoc
-        run: |
-          curl -Lo /tmp/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v21.4/protoc-21.4-linux-x86_64.zip
-          unzip /tmp/protoc.zip -d ${HOME}/.local
-          echo "PROTOC=${HOME}/.local/bin/protoc" >> $GITHUB_ENV
-          export PATH="${PATH}:${HOME}/.local/bin"
-      - name: Install buf
-        run: |
-          curl -sSL https://github.com/bufbuild/buf/releases/download/v1.15.1/buf-Linux-x86_64 \
-            -o /usr/local/bin/buf
-          chmod +x /usr/local/bin/buf
-      - name: Regenerate proto definitions
-        working-directory: ./tools/proto-compiler/
-        run: cargo run
-      - name: Ensure that generated proto definitions compile
-        uses: actions-rs/cargo@v1
-        with:
-          command: build-all