Merge pull request #249 from flanksource/test-workflow-fix

chore: fix test workflow
flanksource · Aug 17, 2021 · 3f4b972 · 3f4b972
2 parents 8172183 + 6865fcf
commit 3f4b972
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 34 deletions.
diff --git a/.github/workflows/cron-test.yml b/.github/workflows/cron-test.yml
@@ -0,0 +1,32 @@
+on:
+  schedule:
+    - cron: '0 10 * * *'
+name: Cron Test
+jobs:
+  test:
+    strategy:
+      matrix:
+        go-version: [1.16.x]
+        platform: [ubuntu-latest]
+        k8s:
+          - v1.18.6
+          - v1.20.7
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Install Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Install yq
+        run: |
+          sudo curl -L https://github.com/mikefarah/yq/releases/download/v4.9.6/yq_linux_amd64 -o /usr/bin/yq
+          sudo chmod +x /usr/bin/yq
+      - name: Test
+        env:
+          KUBERNETES_VERSION: ${{matrix.k8s}}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          TEST_FOLDER: fixtures-cron
+        run: ./test/e2e.sh
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -3,11 +3,17 @@ on:
   push:
     branches:
       - master
+    paths:
+      - "**.go"
+      - "Makefile"
+      - "**.yaml"
+      - '**.yml'
   pull_request:
     paths:
       - "**.go"
       - "Makefile"
       - "**.yaml"
+      - '**.yml'
 jobs:
   golangci:
     name: lint

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,7 +4,19 @@ on:
       - v*
     branches:
       - master
+    paths:
+      - "**.go"
+      - "Makefile"
+      - "**.yaml"
+      - '**.yml'
+      - 'test/**'
   pull_request:
+    paths:
+      - "**.go"
+      - "Makefile"
+      - "**.yaml"
+      - '**.yml'
+      - 'test/**'
 name: Test
 jobs:
   test:
@@ -30,37 +42,4 @@ jobs:
       - name: Test
         env:
           KUBERNETES_VERSION: ${{matrix.k8s}}
-        run: ./test/e2e.sh
----
-on:
- schedule:
-   - cron: '0 10 * * *'
-name: Cron Test
-jobs:
-  test:
-    strategy:
-      matrix:
-        go-version: [1.16.x]
-        platform: [ubuntu-latest]
-        k8s:
-          - v1.18.6
-          - v1.20.7
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - name: Install Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go-version }}
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Install yq
-        run: |
-          sudo curl -L https://github.com/mikefarah/yq/releases/download/v4.9.6/yq_linux_amd64 -o /usr/bin/yq
-          sudo chmod +x /usr/bin/yq
-      - name: Test
-        env:
-          KUBERNETES_VERSION: ${{matrix.k8s}}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          TEST_FOLDER: fixtures-cron
-        run: ./test/e2e.sh
+        run: ./test/e2e.sh