summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancis Lavoie <lavofr@gmail.com>2020-03-23 16:26:53 -0400
committerGitHub <noreply@github.com>2020-03-23 14:26:53 -0600
commit2491336c11e8786281f9e37a5cc3d78dd15aab13 (patch)
tree9ea76e76f206fda17d6c6ffb603a44886c9190eb
parent169883868503c809c9ac9c8c1fe93c7deff9cd2e (diff)
ci: Update branches to master (#3177)
* Update ci.yml * Update fuzzing.yml
-rw-r--r--.github/workflows/ci.yml6
-rw-r--r--.github/workflows/fuzzing.yml4
2 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0bc262b..43bac7f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,10 +5,10 @@ name: Cross-Platform
on:
push:
branches:
- - v2
+ - master
pull_request:
branches:
- - v2
+ - master
jobs:
test:
@@ -123,4 +123,4 @@ jobs:
uses: reviewdog/action-golangci-lint@v1
# uses: docker://reviewdog/action-golangci-lint:v1 # pre-build docker image
with:
- github_token: ${{ secrets.github_token }} \ No newline at end of file
+ github_token: ${{ secrets.github_token }}
diff --git a/.github/workflows/fuzzing.yml b/.github/workflows/fuzzing.yml
index a0487c1..b8a1320 100644
--- a/.github/workflows/fuzzing.yml
+++ b/.github/workflows/fuzzing.yml
@@ -4,10 +4,10 @@ on:
# Regression testing
push:
branches:
- - v2
+ - master
pull_request:
branches:
- - v2
+ - master
# Daily midnight fuzzing
schedule: