Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v4.0-rhel] Cirrus: Use fixed netavark/aardvark-dns branch #14326

Merged
merged 2 commits into from
Jun 2, 2022
Merged

[v4.0-rhel] Cirrus: Use fixed netavark/aardvark-dns branch #14326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3053e6
CI: fix golangci-lint installation
Mar 10, 2022
45d9aad
Cirrus: Use fixed netavark/aardvark-dns branch
cevich May 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ env:
# Name of the ultimate destination branch for this CI run, PR or post-merge.
DEST_BRANCH: "v4.0-rhel"
# Netavark branch to use when TEST_ENVIRON=host-netavark
NETAVARK_BRANCH: "main" # TODO: This should point to a release branch
NETAVARK_BRANCH: "v1.0.1-rhel" # TODO: This should point to a release branch
# Aardvark branch to use
AARDVARK_BRANCH: "main" # TODO: This should also be a release branch
AARDVARK_BRANCH: "v1.0.1-rhel" # TODO: This should also be a release branch
# Overrides default location (/tmp/cirrus) for repo clone
GOPATH: &gopath "/var/tmp/go"
GOBIN: "${GOPATH}/bin"
Expand Down
2 changes: 1 addition & 1 deletion hack/install_golangci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ die() { echo "${1:-No error message given} (from $(basename $0))"; exit 1; }

function install() {
echo "Installing golangci-lint v$VERSION into $BIN"
curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b ./bin v$VERSION
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v$VERSION
}

BIN="./bin/golangci-lint"
Expand Down