Skip to content

Commit

Permalink
Merge pull request #451 from stgraber/main
Browse files Browse the repository at this point in the history
Fix Github CI and OVN peer issue
  • Loading branch information
brauner committed Jan 29, 2024
2 parents 6f8dafa + bfdd692 commit 59dfb7e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/tests.yml
Expand Up @@ -237,11 +237,12 @@ jobs:
# reclaim some space
sudo apt-get clean
mkdir -p "$(go env GOPATH)/bin"
curl -sSfL https://dl.min.io/server/minio/release/linux-amd64/minio --output "$(go env GOPATH)/bin/minio"
chmod +x "$(go env GOPATH)/bin/minio"
# Download minio.
curl -sSfL https://dl.min.io/server/minio/release/linux-amd64/archive/minio_20240116160738.0.0_amd64.deb --output /tmp/minio.deb
sudo apt-get install /tmp/minio.deb --yes
# Download latest release of openfga server.
mkdir -p "$(go env GOPATH)/bin/"
curl -sSfL https://api.github.com/repos/openfga/openfga/releases/latest | jq -r '.assets | .[] | .browser_download_url | select(. | test("_linux_amd64.tar.gz$"))' | xargs -I {} curl -sSfL {} -o openfga.tar.gz
tar -xzf openfga.tar.gz -C "$(go env GOPATH)/bin/"
Expand Down Expand Up @@ -272,7 +273,7 @@ jobs:
exit 1
fi
sudo snap install microceph --edge
sudo snap install microceph --channel=quincy/stable
sudo apt-get install --no-install-recommends -y ceph-common
sudo microceph cluster bootstrap
sudo microceph.ceph config set global osd_pool_default_size 1
Expand Down
2 changes: 1 addition & 1 deletion internal/server/db/network_peers.go
Expand Up @@ -110,7 +110,7 @@ func (c *ClusterTx) CreateNetworkPeer(ctx context.Context, networkID int64, info
}
}

return localPeerID, targetPeerNetworkID > -1, err
return localPeerID, targetPeerNetworkID > -1, nil
}

// networkPeerConfigAdd inserts Network peer config keys.
Expand Down

0 comments on commit 59dfb7e

Please sign in to comment.