From 6a4780e7525220bbf5781c041d13e127cd39110b Mon Sep 17 00:00:00 2001
From: Ezequiel Raynaudo <raynaudo.ee@gmail.com>
Date: Mon, 25 Nov 2024 09:35:05 -0300
Subject: [PATCH] Restore github actions

---
 .github/workflows/build.yml | 21 +++++++++++++++++----
 .github/workflows/lint.yml  |  5 +++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e8f6cae..aefa828 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,9 +1,11 @@
-name: Build
+name: Build and Test
 on:
   pull_request:
+  merge_group:
   push:
     branches:
-      - cp-main
+      - main
+      - release/**
 permissions:
   contents: read
 
@@ -18,6 +20,17 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.23.0"
+          go-version: "1.22.2"
       - name: Build
-        run: make
+        run: make build
+
+  test:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.22.2"
+      - name: Test
+        run: make test
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 6d7037d..19c31aa 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -3,7 +3,8 @@ on:
   pull_request:
   push:
     branches:
-      - cp-main
+      - main
+      - release/**
 
 permissions:
   contents: read
@@ -15,6 +16,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.23.0"
+          go-version: "1.22.2"
       - name: Run Linter
         run: make lint
\ No newline at end of file