Skip to content

Commit 6f262ba

Browse files
authored
Merge pull request #3 from stackrox/mc/build-fixes
Build fixes + GHA test
2 parents 8a0b127 + 93e3dff commit 6f262ba

4 files changed

Lines changed: 3 additions & 6 deletions

File tree

.github/workflows/code-quality.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Install golangci-lint
2525
run: |
26-
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v2.5.0
26+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.5.0
2727
2828
- name: Check formatting
2929
run: |

.golangci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ issues:
3232
max-same-issues: 0
3333

3434
output:
35-
formats:
36-
colored-line-number:
37-
path: stdout
3835
print-issued-lines: true
3936
print-linter-name: true
4037
sort-results: true

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN echo "Building for ${TARGETOS}/${TARGETARCH}" && \
3030
CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build \
3131
-ldflags "-w -s -X main.version=${VERSION} -X main.gitCommit=${GIT_COMMIT} -X main.buildDate=${BUILD_DATE}" \
3232
-o roxie \
33-
./cmd/roxie
33+
./cmd
3434

3535
# Stage 2: Runtime image based on Red Hat UBI Minimal
3636
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"-X main.buildDate=1970-01-01T00:00:00Z"
4646
];
4747

48-
subPackages = [ "cmd/roxie" ];
48+
subPackages = [ "cmd" ];
4949

5050
meta = with pkgs.lib; {
5151
description = "Fast, developer-friendly CLI to deploy and manage Red Hat Advanced Cluster Security (ACS)";

0 commit comments

Comments
 (0)