From 8fc279fa273529113f63d0d5a3d74f6f9e3f2af5 Mon Sep 17 00:00:00 2001 From: Alexandre Pujol Date: Tue, 23 Nov 2021 20:20:06 +0000 Subject: [PATCH] Move go code to a more common directory. --- .gitlab-ci.yml | 2 +- PKGBUILD | 4 ++-- {src/cmd => cmd}/aa-log/main.go | 0 src/go.mod => go.mod | 0 src/go.sum | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename {src/cmd => cmd}/aa-log/main.go (100%) rename src/go.mod => go.mod (100%) delete mode 100644 src/go.sum diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3756e9af6..eddc7c2fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ golangci-lint: stage: lint image: golangci/golangci-lint script: - - cd src && golangci-lint run + - golangci-lint run goreport: stage: lint diff --git a/PKGBUILD b/PKGBUILD index 9ccae5b48..b4d2e23cc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -24,13 +24,13 @@ prepare() { } build() { - cd "$srcdir/$pkgname/src" + cd "$srcdir/$pkgname/" export CGO_CPPFLAGS="${CPPFLAGS}" export CGO_CFLAGS="${CFLAGS}" export CGO_CXXFLAGS="${CXXFLAGS}" export CGO_LDFLAGS="${LDFLAGS}" export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" - go build -o ../.build/ ./cmd/aa-log + go build -o .build/ ./cmd/aa-log } package() { diff --git a/src/cmd/aa-log/main.go b/cmd/aa-log/main.go similarity index 100% rename from src/cmd/aa-log/main.go rename to cmd/aa-log/main.go diff --git a/src/go.mod b/go.mod similarity index 100% rename from src/go.mod rename to go.mod diff --git a/src/go.sum b/src/go.sum deleted file mode 100644 index e69de29bb..000000000