From 6344528e4f32ba9e94c1f930b452b5686935bf3a Mon Sep 17 00:00:00 2001 From: Philip Laine Date: Mon, 30 Nov 2020 21:43:17 +0100 Subject: [PATCH] Fix smaller issues Signed-off-by: Philip Laine --- .github/actions/run-tests/Dockerfile | 3 +-- pkg/git/common/common.go | 2 +- pkg/git/git.go | 2 +- pkg/git/v1/checkout.go | 2 +- pkg/git/v1/checkout_test.go | 2 +- pkg/git/v1/commit.go | 2 +- pkg/git/v1/transport.go | 2 +- pkg/git/v1/transport_test.go | 2 +- pkg/git/v2/checkout.go | 2 +- pkg/git/v2/checkout_test.go | 2 +- pkg/git/v2/commit.go | 2 +- pkg/git/v2/transport.go | 2 +- pkg/git/v2/{trasnport_test.go => transport_test.go} | 2 +- 13 files changed, 13 insertions(+), 14 deletions(-) rename pkg/git/v2/{trasnport_test.go => transport_test.go} (99%) diff --git a/.github/actions/run-tests/Dockerfile b/.github/actions/run-tests/Dockerfile index e2583779..c096a0b9 100644 --- a/.github/actions/run-tests/Dockerfile +++ b/.github/actions/run-tests/Dockerfile @@ -1,8 +1,7 @@ FROM golang:1.15-alpine # Add any build or testing essential system packages -RUN apk add --no-cache build-base git -RUN apk add gcc pkgconfig libc-dev +RUN apk add --no-cache build-base git pkgconf RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community libgit2-dev=1.1.0-r1 # Use the GitHub Actions uid:gid combination for proper fs permissions diff --git a/pkg/git/common/common.go b/pkg/git/common/common.go index 6f502043..3b949fbb 100644 --- a/pkg/git/common/common.go +++ b/pkg/git/common/common.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Flux CD contributors. +Copyright 2020 The Flux authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/git/git.go b/pkg/git/git.go index 93416fe4..5e32f38e 100644 --- a/pkg/git/git.go +++ b/pkg/git/git.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Flux CD contributors. +Copyright 2020 The Flux authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/git/v1/checkout.go b/pkg/git/v1/checkout.go index 5f29e6e0..64e952b0 100644 --- a/pkg/git/v1/checkout.go +++ b/pkg/git/v1/checkout.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Flux CD contributors. +Copyright 2020 The Flux authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/git/v1/checkout_test.go b/pkg/git/v1/checkout_test.go index a8267592..df7781d7 100644 --- a/pkg/git/v1/checkout_test.go +++ b/pkg/git/v1/checkout_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Flux CD contributors. +Copyright 2020 The Flux authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/git/v1/commit.go b/pkg/git/v1/commit.go index c8f7aa46..7ff24baa 100644 --- a/pkg/git/v1/commit.go +++ b/pkg/git/v1/commit.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Flux CD contributors. +Copyright 2020 The Flux authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/git/v1/transport.go b/pkg/git/v1/transport.go index 66124060..f8f64f5a 100644 --- a/pkg/git/v1/transport.go +++ b/pkg/git/v1/transport.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Flux CD contributors. +Copyright 2020 The Flux authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/git/v1/transport_test.go b/pkg/git/v1/transport_test.go index 515888c6..8e27033e 100644 --- a/pkg/git/v1/transport_test.go +++ b/pkg/git/v1/transport_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Flux CD contributors. +Copyright 2020 The Flux authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/git/v2/checkout.go b/pkg/git/v2/checkout.go index 807aa5bf..78dc7c17 100644 --- a/pkg/git/v2/checkout.go +++ b/pkg/git/v2/checkout.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Flux CD contributors. +Copyright 2020 The Flux authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/git/v2/checkout_test.go b/pkg/git/v2/checkout_test.go index 66a14362..fd4494b6 100644 --- a/pkg/git/v2/checkout_test.go +++ b/pkg/git/v2/checkout_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Flux CD contributors. +Copyright 2020 The Flux authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/git/v2/commit.go b/pkg/git/v2/commit.go index 6ff68c9e..62c7c6d8 100644 --- a/pkg/git/v2/commit.go +++ b/pkg/git/v2/commit.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Flux CD contributors. +Copyright 2020 The Flux authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/git/v2/transport.go b/pkg/git/v2/transport.go index d39b13b6..992e4d94 100644 --- a/pkg/git/v2/transport.go +++ b/pkg/git/v2/transport.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Flux CD contributors. +Copyright 2020 The Flux authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/pkg/git/v2/trasnport_test.go b/pkg/git/v2/transport_test.go similarity index 99% rename from pkg/git/v2/trasnport_test.go rename to pkg/git/v2/transport_test.go index 5729b47b..8428229e 100644 --- a/pkg/git/v2/trasnport_test.go +++ b/pkg/git/v2/transport_test.go @@ -1,5 +1,5 @@ /* -Copyright 2020 The Flux CD contributors. +Copyright 2020 The Flux authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.