From 6714b79f97564886c8d22ea2ef4e345a37e2af59 Mon Sep 17 00:00:00 2001
From: Simone Basso <bassosimone@gmail.com>
Date: Tue, 2 Feb 2021 15:57:37 +0100
Subject: [PATCH] refactor: integrate more probe-engine workflows (#204)

This diff is part of https://github.com/ooni/probe/issues/1335.

We are moving more probe-engine workflows to toplevel.

The general idea here is to migrate all possible workflows and to
delete the ones that we cannot use in this repo (if any).
---
 .../workflows/alltests.yml                    |  2 +-
 .../workflows/coverage.yml                    |  4 +--
 .github/workflows/golang.yml                  | 32 -------------------
 .../workflows/shorttests.yml                  |  0
 4 files changed, 3 insertions(+), 35 deletions(-)
 rename {internal/engine/.github => .github}/workflows/alltests.yml (74%)
 rename {internal/engine/.github => .github}/workflows/coverage.yml (90%)
 delete mode 100644 .github/workflows/golang.yml
 rename {internal/engine/.github => .github}/workflows/shorttests.yml (100%)

diff --git a/internal/engine/.github/workflows/alltests.yml b/.github/workflows/alltests.yml
similarity index 74%
rename from internal/engine/.github/workflows/alltests.yml
rename to .github/workflows/alltests.yml
index 2f29554..4d02b97 100644
--- a/internal/engine/.github/workflows/alltests.yml
+++ b/.github/workflows/alltests.yml
@@ -13,4 +13,4 @@ jobs:
         with:
           go-version: "1.14"
       - uses: actions/checkout@v2
-      - run: go test -race -tags integration,shaping -coverprofile=probe-engine.cov ./...
+      - run: go test -race -tags shaping ./...
diff --git a/internal/engine/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
similarity index 90%
rename from internal/engine/.github/workflows/coverage.yml
rename to .github/workflows/coverage.yml
index 9e58a7d..c81a28f 100644
--- a/internal/engine/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -15,10 +15,10 @@ jobs:
         with:
           go-version: "${{ matrix.go }}"
       - uses: actions/checkout@v2
-      - run: go test -short -race -tags shaping -coverprofile=probe-engine.cov ./...
+      - run: go test -short -race -tags shaping -coverprofile=probe-cli.cov ./...
       - uses: shogo82148/actions-goveralls@v1
         with:
-          path-to-profile: probe-engine.cov
+          path-to-profile: probe-cli.cov
           parallel: true
   finish:
     needs: test
diff --git a/.github/workflows/golang.yml b/.github/workflows/golang.yml
deleted file mode 100644
index 390809d..0000000
--- a/.github/workflows/golang.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Run tests and measure coverage
-name: golang
-on:
-  push:
-  pull_request:
-  schedule:
-    - cron: "14 17 * * 3"
-jobs:
-  test:
-    runs-on: "${{ matrix.os }}"
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ["ubuntu-latest"]
-        go: ["1.14"]
-    steps:
-      - uses: actions/setup-go@v1
-        with:
-          go-version: ${{ matrix.go }}
-      - uses: actions/checkout@v2
-      - run: go test -race -tags shaping -coverprofile=probe-cli.cov -coverpkg=./... ./...
-      - uses: shogo82148/actions-goveralls@v1
-        with:
-          path-to-profile: probe-cli.cov
-          parallel: true
-  finish:
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: shogo82148/actions-goveralls@v1
-        with:
-          parallel-finished: true
diff --git a/internal/engine/.github/workflows/shorttests.yml b/.github/workflows/shorttests.yml
similarity index 100%
rename from internal/engine/.github/workflows/shorttests.yml
rename to .github/workflows/shorttests.yml