fix ci

hetznercloud · Sep 23, 2024 · 08a9ce5 · 08a9ce5
1 parent e64d3f4
commit 08a9ce5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,6 +32,29 @@ jobs:
           args: --timeout 5m
 
   test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.23"
+
+      - name: Run tests
+        run: go test -coverpkg=./... -coverprofile=coverage.txt -v -race ./...
+
+      - name: Upload coverage reports to Codecov
+        if: >
+          !startsWith(github.head_ref, 'renovate/') &&
+          !startsWith(github.head_ref, 'release-please--')
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          flags: unit
+
+  test-e2e:
     runs-on: ubuntu-latest
     permissions:
       id-token: write
@@ -44,8 +67,10 @@ jobs:
         with:
           go-version: "1.23"
 
+      - uses: hetznercloud/tps-action@main
+
       - name: Run tests
-        run: go test -coverpkg=./... -coverprofile=coverage.txt -v -race ./...
+        run: go test -tags e2e -coverpkg=./... -coverprofile=coverage.txt -v -race ./test/e2e
 
       - name: Upload coverage reports to Codecov
         if: >
@@ -54,6 +79,7 @@ jobs:
         uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
+          flags: e2e
 
   generate:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/e2e_test.yml b/.github/workflows/e2e_test.yml
@@ -7,27 +7,3 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: "1.23"
-
-      - uses: hetznercloud/tps-action@main
-
-      - name: Run tests
-        run: go test -tags e2e -coverpkg=./... -coverprofile=coverage.txt -v -race ./test/e2e
-
-      - name: Upload coverage reports to Codecov
-        if: >
-          !startsWith(github.head_ref, 'renovate/') &&
-          !startsWith(github.head_ref, 'release-please--')
-        uses: codecov/codecov-action@v4
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}