Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor CI: Use Drone and Go 1.16 #168

Merged
merged 5 commits into from
Feb 19, 2021
Merged

Refactor CI: Use Drone and Go 1.16 #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
90496ce
Use Go 1.16
trotttrotttrott Feb 18, 2021
d172201
Fix test for Go 1.16
trotttrotttrott Feb 18, 2021
1c1e1d0
Use Drone instead of Travis
trotttrotttrott Feb 18, 2021
24e45cb
Add build status
trotttrotttrott Feb 18, 2021
e6a6895
Fix golang image tag
trotttrotttrott Feb 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
kind: pipeline
type: docker
name: test-pr

platform:
os: linux
arch: amd64

steps:

- name: tests
image: golang:1.16
commands:
- make vet
- make test
- make testacc
environment:
GRAFANA_URL: http://grafana:3000
GRAFANA_AUTH: admin:admin
GRAFANA_ORG_ID: 1

services:
- name: grafana
image: grafana/grafana:7.4.2

trigger:
event:
- pull_request
30 changes: 0 additions & 30 deletions .travis.yml
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

# Terraform Provider for Grafana

[![Build Status](https://drone.grafana.net/api/badges/grafana/terraform-provider-grafana/status.svg)](https://drone.grafana.net/grafana/terraform-provider-grafana)

- Terraform website: https://terraform.io
- Grafana website: https://grafana.com
- Provider Documentation: https://registry.terraform.io/providers/grafana/grafana/latest/docs
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.8'

services:
grafana-provider:
image: golang:1.14
image: golang:1.16
environment:
- GRAFANA_URL=http://grafana:3000
- GRAFANA_AUTH=admin:admin
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/terraform-providers/terraform-provider-grafana

go 1.14
go 1.16

require (
github.com/grafana/grafana-api-golang-client v0.0.0-20210204123314-0aa501c4b8c4
Expand Down
2 changes: 1 addition & 1 deletion grafana/resource_alert_notification_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func TestAccAlertNotification_invalid_frequence(t *testing.T) {
CheckDestroy: testAccAlertNotificationCheckDestroy(&alertNotification),
Steps: []resource.TestStep{
{
ExpectError: regexp.MustCompile("time: invalid duration hi"),
ExpectError: regexp.MustCompile("time: invalid duration \"hi\""),
Config: testAccAlertNotificationConfig_invalid_frequency,
},
},
Expand Down