From 29765db34c7c8b2e619c602c4484f9c568023382 Mon Sep 17 00:00:00 2001
From: ChihChengLiang <chihchengliang@gmail.com>
Date: Sat, 9 Sep 2023 12:29:44 +0800
Subject: [PATCH 1/3] update CI for MPTWG

---
 .github/workflows/lints.yml                   |  2 +-
 .github/workflows/mpt-witness-generator.yml   | 44 +++++++++++++++++++
 .../.github/workflows/go.yml                  | 33 --------------
 3 files changed, 45 insertions(+), 34 deletions(-)
 create mode 100644 .github/workflows/mpt-witness-generator.yml
 delete mode 100644 mpt-witness-generator/.github/workflows/go.yml

diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml
index 987e74d8ce..78d8c137aa 100644
--- a/.github/workflows/lints.yml
+++ b/.github/workflows/lints.yml
@@ -20,7 +20,7 @@ jobs:
         with:
           cancel_others: 'true'
           concurrent_skipping: 'same_content_newer'
-          paths_ignore: '["**/README.md"]'
+          paths_ignore: '["**/README.md", "mpt-witness-generator/**"]'
 
   lints:
     needs: [skip_check]
diff --git a/.github/workflows/mpt-witness-generator.yml b/.github/workflows/mpt-witness-generator.yml
new file mode 100644
index 0000000000..b5845e5355
--- /dev/null
+++ b/.github/workflows/mpt-witness-generator.yml
@@ -0,0 +1,44 @@
+name: MPT Witness Generator Checks
+
+on:
+  merge_group:
+  pull_request:
+    types: [synchronize, opened, reopened, ready_for_review]
+  push:
+    branches:
+      - main
+
+jobs:
+  skip_check:
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          cancel_others: 'true'
+          concurrent_skipping: 'same_content_newer'
+          paths: '["mpt-witness-generator/**"]'
+
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.20'
+
+    - name: Format
+      run: go fmt ./...
+
+    - name: Build
+      run: go build -v ./...
+
+    - name: Test
+      env:
+        NO_GETH: true
+      run: go test -v ./...
diff --git a/mpt-witness-generator/.github/workflows/go.yml b/mpt-witness-generator/.github/workflows/go.yml
deleted file mode 100644
index 35860814a3..0000000000
--- a/mpt-witness-generator/.github/workflows/go.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-# This workflow will build a golang project
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
-
-name: Go
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-
-jobs:
-
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Set up Go
-      uses: actions/setup-go@v4
-      with:
-        go-version: '1.20'
-
-    - name: Format
-      run: go fmt ./...
-
-    - name: Build
-      run: go build -v ./...
-
-    - name: Test
-      env:
-        NO_GETH: true
-      run: go test -v ./...

From e117d0b7c1f70201211478b6d103b7391e34271b Mon Sep 17 00:00:00 2001
From: ChihChengLiang <chihchengliang@gmail.com>
Date: Sat, 9 Sep 2023 12:35:17 +0800
Subject: [PATCH 2/3] fix working dir

---
 .github/workflows/mpt-witness-generator.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/mpt-witness-generator.yml b/.github/workflows/mpt-witness-generator.yml
index b5845e5355..8e9a7b5e42 100644
--- a/.github/workflows/mpt-witness-generator.yml
+++ b/.github/workflows/mpt-witness-generator.yml
@@ -33,12 +33,15 @@ jobs:
         go-version: '1.20'
 
     - name: Format
+      working-directory: ./mpt-witness-generator
       run: go fmt ./...
 
     - name: Build
+      working-directory: ./mpt-witness-generator
       run: go build -v ./...
 
     - name: Test
+      working-directory: ./mpt-witness-generator
       env:
         NO_GETH: true
       run: go test -v ./...

From b84da758cc3d38aed68d8db47c074419518cfe0f Mon Sep 17 00:00:00 2001
From: ChihChengLiang <chihchengliang@gmail.com>
Date: Tue, 12 Sep 2023 22:32:42 +0800
Subject: [PATCH 3/3] fix gofmt

---
 .github/workflows/mpt-witness-generator.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/mpt-witness-generator.yml b/.github/workflows/mpt-witness-generator.yml
index 8e9a7b5e42..77da2fa9c8 100644
--- a/.github/workflows/mpt-witness-generator.yml
+++ b/.github/workflows/mpt-witness-generator.yml
@@ -33,8 +33,10 @@ jobs:
         go-version: '1.20'
 
     - name: Format
-      working-directory: ./mpt-witness-generator
-      run: go fmt ./...
+      uses: Jerome1337/gofmt-action@v1.0.5
+      with:
+        gofmt-path: './mpt-witness-generator'
+        gofmt-flags: '-l -d'
 
     - name: Build
       working-directory: ./mpt-witness-generator