Skip to content

Commit

Permalink
Merge pull request #3 from lafirest/dev
Browse files Browse the repository at this point in the history
chore: fix patch and compose file
  • Loading branch information
lafirest authored Nov 18, 2023
2 parents 98271d8 + ec3a1f3 commit 22792e4
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 5 deletions.
20 changes: 17 additions & 3 deletions .devcontainer/add_erlang_bindings.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
diff --git a/bindings/bindingtester/__init__.py b/bindings/bindingtester/__init__.py
index 17d06cf..1f6e1e3 100644
--- a/bindings/bindingtester/__init__.py
+++ b/bindings/bindingtester/__init__.py
@@ -22,7 +22,7 @@ import math
import sys
import os

-sys.path[:0] = [os.path.join(os.path.dirname(__file__), '..', '..', 'bindings', 'python')]
+#sys.path[:0] = [os.path.join(os.path.dirname(__file__), '..', '..', 'bindings', 'python')]

import util

diff --git a/bindings/bindingtester/known_testers.py b/bindings/bindingtester/known_testers.py
index 70e1f814..85dcde51 100644
index 70e1f81..85dcde5 100644
--- a/bindings/bindingtester/known_testers.py
+++ b/bindings/bindingtester/known_testers.py
@@ -58,6 +58,7 @@ _java_cmd = 'java -ea -cp %s:%s com.apple.foundationdb.test.' % (

# We could set min_api_version lower on some of these if the testers were updated to support them
testers = {
+ 'erlang': Tester('erlang', '/usr/src/erlfdb/test/tester.es', 2040, 710, MAX_API_VERSION, types=ALL_TYPES, tenants_enabled=True),
'python': Tester('python', 'python ' + _absolute_path('python/tests/tester.py'), 2040, 23, MAX_API_VERSION, types=ALL_TYPES, tenants_enabled=True),
'python3': Tester('python3', 'python3 ' + _absolute_path('python/tests/tester.py'), 2040, 23, MAX_API_VERSION, types=ALL_TYPES, tenants_enabled=True),
'ruby': Tester('ruby', _absolute_path('ruby/tests/tester.rb'), 2040, 23, MAX_API_VERSION),

'ruby': Tester('ruby', _absolute_path('ruby/tests/tester.rb'), 2040, 23, MAX_API_VERSION),
4 changes: 2 additions & 2 deletions .devcontainer/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
ERLANG_VERSION: "24"

# This should always match the value in fdb.image
FDB_VERSION: "6.3.23"
FDB_VERSION: "7.1.43"

environment:
# This needs to match the name of the FoundationDB service below
Expand All @@ -28,4 +28,4 @@ services:
network_mode: service:fdb

fdb:
image: foundationdb/foundationdb:6.3.23
image: foundationdb/foundationdb:7.1.43

0 comments on commit 22792e4

Please sign in to comment.