Skip to content

Commit

Permalink
Merge branch 'master' into 2102-dnsrewrite
Browse files Browse the repository at this point in the history
  • Loading branch information
ainar-g committed Dec 10, 2020
2 parents 264c0ca + e948b30 commit f80f32b
Show file tree
Hide file tree
Showing 4 changed files with 98 additions and 27 deletions.
47 changes: 47 additions & 0 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: golangci-lint
on:
push:

jobs:

golangci:
runs-on:
- ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: golangci-lint
uses: golangci/[email protected]
with:
# This field is required. Dont set the patch version to always use
# the latest patch version.
version: v1.32

notify:
needs:
- golangci
# Secrets are not passed to workflows that are triggered by a pull request
# from a fork.
#
# Use always() to signal to the runner that this job must run even if the
# previous ones failed.
if:
${{ always() &&
(
github.event_name == 'push' ||
github.event.pull_request.head.repo.full_name == github.repository
)
}}
runs-on: ubuntu-latest
steps:
- name: Conclusion
uses: technote-space/workflow-conclusion-action@v1
- name: Send Slack notif
uses: 8398a7/action-slack@v3
with:
status: ${{ env.WORKFLOW_CONCLUSION }}
fields: repo, message, commit, author, job
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
51 changes: 51 additions & 0 deletions .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Create release

on:
push:

jobs:
tests:
runs-on:
- ubuntu-latest
env:
GO111MODULE: "on"

steps:
- uses: actions/checkout@master

- uses: actions/setup-go@v1
with:
go-version: 1.14.x

- name: tests
run: go test -mod=vendor -race -v -bench="." -coverprofile="coverage.txt" -covermode=atomic ./...

- name: Upload coverage
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.txt

notify:
needs:
- tests
if:
${{ always() &&
(
github.event_name == 'push' ||
github.event.pull_request.head.repo.full_name == github.repository
)
}}
runs-on: ubuntu-latest
steps:
- name: Conclusion
uses: technote-space/workflow-conclusion-action@v1

- name: Send Slack notif
uses: 8398a7/action-slack@v3
with:
status: ${{ env.WORKFLOW_CONCLUSION }}
fields: repo, message, commit, author, job
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
26 changes: 0 additions & 26 deletions .travis.yml

This file was deleted.

1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
[![Build Status](https://travis-ci.com/AdguardTeam/urlfilter.svg?branch=master)](https://travis-ci.com/AdguardTeam/urlfilter)
[![Code Coverage](https://img.shields.io/codecov/c/github/AdguardTeam/urlfilter/master.svg)](https://codecov.io/github/AdguardTeam/urlfilter?branch=master)
[![Go Report Card](https://goreportcard.com/badge/github.com/AdguardTeam/urlfilter)](https://goreportcard.com/report/AdguardTeam/urlfilter)
[![GolangCI](https://golangci.com/badges/github.com/AdguardTeam/urlfilter.svg)](https://golangci.com/r/github.com/AdguardTeam/urlfilter)
Expand Down

0 comments on commit f80f32b

Please sign in to comment.