From a766efc15a067bca49c1d80521f1c5bb99d53a68 Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Fri, 17 Nov 2023 23:16:21 +0100 Subject: [PATCH] ci: fix cluster file --- .github/workflows/ci.yml | 12 ++++++------ src/erlfdb_util.erl | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc3dfd4..f93f904 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,6 +107,12 @@ jobs: foundationdb: image: foundationdb/foundationdb:7.1.43 steps: + - name: Check out repository code + uses: actions/checkout@v4 + with: + persist-credentials: false + - name: Compile erlfdb + run: rebar3 compile - name: Create FDB cluster file env: # This needs to match the name of the service above so the script can do @@ -116,12 +122,6 @@ jobs: run: bash /usr/local/bin/create_cluster_file.bash - name: Initialize FDB database run: fdbcli --exec "configure new single ssd" - - name: Check out repository code - uses: actions/checkout@v4 - with: - persist-credentials: false - - name: Compile erlfdb - run: rebar3 compile - name: Execute unit tests run: rebar3 eunit - name: Execute binding test diff --git a/src/erlfdb_util.erl b/src/erlfdb_util.erl index 2e7f4ba..f60e857 100644 --- a/src/erlfdb_util.erl +++ b/src/erlfdb_util.erl @@ -107,7 +107,7 @@ init_test_cluster_int(Options) -> ClusterName = ?MODULE:get(Options, cluster_name, <<"erlfdbtest">>), ClusterId = ?MODULE:get(Options, cluster_id, <<"erlfdbtest">>), - DefaultClusterFile = filename:join(Dir, <<"erlfdb.cluster">>), + DefaultClusterFile = <<"/etc/foundationdb/fdb.cluster">>, ClusterFile = ?MODULE:get(Options, cluster_file, DefaultClusterFile), write_cluster_file(ClusterFile, ClusterName, ClusterId, IpAddr, Port),