(wip) Fix tests.yml

Finschia · Jul 9, 2021 · 47f98c0 · 47f98c0
1 parent 0d7c18e
commit 47f98c0
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 74 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -50,76 +50,88 @@ jobs:
           key: ${{ runner.os }}-${{ github.sha }}-tm-binary
         if: env.GIT_DIFF
 
-#  test_abci_apps:
-#    runs-on: ubuntu-latest
-#    needs: build
-#    timeout-minutes: 5
-#    steps:
-#      - uses: actions/setup-go@v2
-#        with:
-#          go-version: "^1.15.4"
-#      - uses: actions/checkout@v2
-#      - uses: technote-space/get-diff-action@v4
-#        with:
-#          PATTERNS: |
-#            **/**.go
-#            go.mod
-#            go.sum
-#      - uses: actions/cache@v1
-#        with:
-#          path: ~/go/bin
-#          key: ${{ runner.os }}-${{ github.sha }}-tm-binary
-#        if: env.GIT_DIFF
-#      - name: test_abci_apps
-#        run: abci/tests/test_app/test.sh
-#        shell: bash
-#        if: env.GIT_DIFF
-#
-#  test_abci_cli:
-#    runs-on: ubuntu-latest
-#    needs: build
-#    timeout-minutes: 5
-#    steps:
-#      - uses: actions/setup-go@v2
-#        with:
-#          go-version: "^1.15.4"
-#      - uses: actions/checkout@v2
-#      - uses: technote-space/get-diff-action@v4
-#        with:
-#          PATTERNS: |
-#            **/**.go
-#            go.mod
-#            go.sum
-#      - uses: actions/cache@v1
-#        with:
-#          path: ~/go/bin
-#          key: ${{ runner.os }}-${{ github.sha }}-tm-binary
-#        if: env.GIT_DIFF
-#      - run: abci/tests/test_cli/test.sh
-#        shell: bash
-#        if: env.GIT_DIFF
-#
-#  test_apps:
-#    runs-on: ubuntu-latest
-#    needs: build
-#    timeout-minutes: 5
-#    steps:
-#      - uses: actions/setup-go@v2
-#        with:
-#          go-version: "^1.15.4"
-#      - uses: actions/checkout@v2
-#      - uses: technote-space/get-diff-action@v4
-#        with:
-#          PATTERNS: |
-#            **/**.go
-#            go.mod
-#            go.sum
-#      - uses: actions/cache@v1
-#        with:
-#          path: ~/go/bin
-#          key: ${{ runner.os }}-${{ github.sha }}-tm-binary
-#        if: env.GIT_DIFF
-#      - name: test_apps
-#        run: test/app/test.sh
-#        shell: bash
-#        if: env.GIT_DIFF
+  test_abci_apps:
+    runs-on: ubuntu-latest
+    needs: build
+    timeout-minutes: 5
+    steps:
+      - uses: actions/setup-go@v2
+        with:
+          go-version: "^1.15.4"
+      - uses: actions/checkout@v2
+      - uses: technote-space/get-diff-action@v4
+        with:
+          PATTERNS: |
+            **/**.go
+            go.mod
+            go.sum
+      - uses: actions/cache@v1
+        id: gobin-cache
+        with:
+          path: ~/go/bin
+          key: ${{ runner.os }}-${{ github.sha }}-oc-binary
+        if: env.GIT_DIFF
+      - name: Re-install when cannot get the cached binary
+        run: make install install_abci
+        if: steps.gobin-cache.outputs.cache-hit != 'true'
+      - name: test_abci_apps
+        run: abci/tests/test_app/test.sh
+        shell: bash
+        if: env.GIT_DIFF
+
+  test_abci_cli:
+    runs-on: ubuntu-latest
+    needs: build
+    timeout-minutes: 5
+    steps:
+      - uses: actions/setup-go@v2
+        with:
+          go-version: "^1.15.4"
+      - uses: actions/checkout@v2
+      - uses: technote-space/get-diff-action@v4
+        with:
+          PATTERNS: |
+            **/**.go
+            go.mod
+            go.sum
+      - uses: actions/cache@v1
+        id: gobin-cache
+        with:
+          path: ~/go/bin
+          key: ${{ runner.os }}-${{ github.sha }}-oc-binary
+        if: env.GIT_DIFF
+      - name: Re-install when cannot get the cached binary
+        run: make install install_abci
+        if: steps.gobin-cache.outputs.cache-hit != 'true'
+      - run: abci/tests/test_cli/test.sh
+        shell: bash
+        if: env.GIT_DIFF
+
+  test_apps:
+    runs-on: ubuntu-latest
+    needs: build
+    timeout-minutes: 5
+    steps:
+      - uses: actions/setup-go@v2
+        with:
+          go-version: "^1.15.4"
+      - uses: actions/checkout@v2
+      - uses: technote-space/get-diff-action@v4
+        with:
+          PATTERNS: |
+            **/**.go
+            go.mod
+            go.sum
+      - uses: actions/cache@v1
+        id: gobin-cache
+        with:
+          path: ~/go/bin
+          key: ${{ runner.os }}-${{ github.sha }}-oc-binary
+        if: env.GIT_DIFF
+      - name: Re-install when cannot get the cached binary
+        run: make install install_abci
+        if: steps.gobin-cache.outputs.cache-hit != 'true'
+      - name: test_apps
+        run: test/app/test.sh
+        shell: bash
+        if: env.GIT_DIFF
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 *.bak
 .DS_Store
 build/*
+./abci-cli
 rpc/test/.ostracon
 .ostracon
 remote_dump
@@ -22,7 +23,6 @@ docs/_build
 docs/dist
 docs/.vuepress/dist
 *.log
-abci-cli
 docs/node_modules/
 index.html.md