.github/workflows: merge test-* into frontend.yaml

Signed-off-by: Vincent Demeester <[email protected]>
vdemeester · Mar 30, 2022 · 3954a2d · 3954a2d
1 parent d795ced
commit 3954a2d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 28 deletions.
diff --git a/.github/workflows/test-buildctl.yaml → .github/workflows/frontend.yaml b/.github/workflows/test-buildctl.yaml → .github/workflows/frontend.yaml
@@ -1,4 +1,4 @@
-name: test-buildctl
+name: frontend
 
 on:
   push:
@@ -8,8 +8,24 @@ on:
 
 jobs:
 
+  test-integration:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
+    - name: "Install test dependencies"
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y moreutils make
+    - name: "Run the integration test (docker)"
+      run: ./hack/test.sh
+    - name: "Show the local images"
+      run: docker images --no-trunc
+
   test-integration-buildctl:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
     - uses: actions/checkout@v2
@@ -19,7 +35,7 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y moreutils make
-    - name: "Run the integration test"
+    - name: "Run the integration test (buildctl)"
       run: |
         set -x
         mkdir ${HOME}/bin

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml