Merge branch 'buildtools-version' into 'master'

chore: use buildtools version from env

See merge request unboundsoftware/dancefinder/dancefetcher!1
This commit was merged in pull request #4.
This commit is contained in:
2021-04-06 12:28:14 +00:00
2 changed files with 9 additions and 6 deletions
+1 -1
View File
@@ -6,7 +6,7 @@ stages:
- build - build
- deploy-prod - deploy-prod
image: buildtool/build-tools:0.0.14 image: buildtool/build-tools:${BUILDTOOLS_VERSION}
services: services:
- docker:dind - docker:dind
+8 -5
View File
@@ -43,7 +43,7 @@ func Test_parse(t *testing.T) {
args: args{ args: args{
url: "dalarna.html", url: "dalarna.html",
}, },
want: expectedEventsDalarna, want: expectedEventsDalarna,
wantErr: false, wantErr: false,
}, },
{ {
@@ -51,7 +51,7 @@ func Test_parse(t *testing.T) {
args: args{ args: args{
url: "dalarna2.html", url: "dalarna2.html",
}, },
want: expectedEventsDalarna, want: expectedEventsDalarna,
wantErr: false, wantErr: false,
}, },
{ {
@@ -59,7 +59,7 @@ func Test_parse(t *testing.T) {
args: args{ args: args{
url: "dalarna3.html", url: "dalarna3.html",
}, },
want: expectedEventsDalarna, want: expectedEventsDalarna,
wantErr: false, wantErr: false,
}, },
{ {
@@ -67,7 +67,7 @@ func Test_parse(t *testing.T) {
args: args{ args: args{
url: "gotland.html", url: "gotland.html",
}, },
want: nil, want: nil,
wantErr: false, wantErr: false,
}, },
{ {
@@ -75,7 +75,7 @@ func Test_parse(t *testing.T) {
args: args{ args: args{
url: "uppsala.html", url: "uppsala.html",
}, },
want: expectedEventsUppsala, want: expectedEventsUppsala,
wantErr: false, wantErr: false,
}, },
} }
@@ -127,6 +127,9 @@ func Test_parse(t *testing.T) {
func date(str string) LocalDate { func date(str string) LocalDate {
t, _ := time.ParseInLocation("2006-01-02", str, time.Now().Location()) t, _ := time.ParseInLocation("2006-01-02", str, time.Now().Location())
if t.Year() == 2020 {
t = time.Date(time.Now().Year(), t.Month(), t.Day(), 0, 0, 0, 0, t.Location())
}
return LocalDate(t) return LocalDate(t)
} }