-
Notifications
You must be signed in to change notification settings - Fork 175
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Remove linting from ci-rp - Remove generate from ci-rp
- Loading branch information
1 parent
a251ebe
commit b2cebea
Showing
2 changed files
with
4 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,6 @@ ARG ARO_VERSION | |
|
||
############################################################################### | ||
# Stage 1: Build the SRE Portal Assets | ||
# builder is responsible for all compilation and validation of the RP | ||
############################################################################### | ||
FROM ${REGISTRY}/ubi8/nodejs-16 as portal-build | ||
LABEL aro-portal-build=true | ||
|
@@ -33,15 +32,10 @@ WORKDIR /app | |
ENV GOPATH=/root/go | ||
ENV GOFLAGS="-tags=containers_image_openpgp,exclude_graphdriver_btrfs,exclude_graphdriver_devicemapper" | ||
|
||
# Install golangci-lint and verify | ||
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b /usr/local/bin v1.56.2 && \ | ||
golangci-lint --version || (echo "golangci-lint not found" && exit 1) | ||
|
||
# Copy dependencies and source files | ||
COPY go.mod go.sum ./ | ||
COPY vendor vendor | ||
COPY swagger swagger | ||
COPY .golangci.yml ./ | ||
COPY hack hack | ||
COPY cmd cmd | ||
COPY pkg pkg | ||
|
@@ -50,14 +44,14 @@ COPY test test | |
# Ensure JS assets are available before generating Go code | ||
COPY --from=portal-build /build/pkg/portal/assets/v2/build /app/pkg/portal/assets/v2/build | ||
|
||
# Lint, generate, build, and test | ||
RUN golangci-lint run --verbose | ||
RUN go generate ./... | ||
# Build RP and E2E test suite bins | ||
RUN go build -ldflags "-X github.com/Azure/ARO-RP/pkg/util/version.GitCommit=${ARO_VERSION}" ./cmd/aro | ||
RUN go test ./test/e2e/... -tags e2e,codec.safe -c -ldflags "-X github.com/Azure/ARO-RP/pkg/util/version.GitCommit=${ARO_VERSION}" -o e2e.test | ||
|
||
# Additional tests | ||
# Run unit tests | ||
RUN go run gotest.tools/[email protected] --format pkgname --junitfile report.xml -- -coverprofile=cover.out ./... | ||
|
||
# Validate FIPS | ||
RUN hack/fips/validate-fips.sh ./aro | ||
LABEL stage="rp-build-cache-layer" | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,6 @@ | |
* | ||
|
||
# ...except these | ||
!.golangci.yml | ||
!cmd | ||
!go.mod | ||
!go.sum | ||
|