Merge branch 'main' into dependabot/pip/tests/requests-2.32.2

dekkers · Sep 6, 2024 · 9630e2d · 9630e2d
2 parents 63e935f + 24dd66a
commit 9630e2d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 16 deletions.
diff --git a/.github/workflows/container_image.yml b/.github/workflows/container_image.yml
@@ -1,6 +1,7 @@
 name: Create container image
 
 on:
+  merge_group:
   pull_request:
   push:
     branches:
@@ -16,7 +17,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Docker meta
         id: meta
@@ -30,18 +31,18 @@ jobs:
             type=ref,event=pr
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         id: buildx
 
       - name: Build and export to local docker
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           load: true
           tags: ${{ env.TEST_TAG }}
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         id: py311
         with:
           python-version: 3.11
@@ -58,21 +59,28 @@ jobs:
           docker kill xtdb-test
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push container image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           # We don't use git context because that doesn't process .dockerignore
           # https://github.com/docker/cli/issues/2827
           context: .
-          push: true
+          push: |-
+            ${{
+              github.event_name == 'push' ||
+              (
+                github.event.pull_request.head.repo.owner.login == github.event.pull_request.base.repo.owner.login &&
+                github.actor != 'dependabot[bot]'
+              )
+            }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha

diff --git a/.github/workflows/debian_package.yml b/.github/workflows/debian_package.yml
@@ -1,6 +1,7 @@
 name: Build Debian package
 
 on:
+  merge_group:
   pull_request:
   push:
     branches:
@@ -15,7 +16,7 @@ jobs:
       PKG_NAME: xtdb-http-multinode
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

diff --git a/project.clj b/project.clj
@@ -3,10 +3,10 @@
   :url "https://github.com/dekkers/xtdb-http-multinode"
   :license {:name "MIT"}
   :dependencies [[org.clojure/clojure "1.11.1"]
-                 [com.xtdb/xtdb-core "1.24.1"]
-                 [com.xtdb/xtdb-rocksdb "1.24.1"]
-                 [com.xtdb/xtdb-jdbc "1.24.1"]
-                 [com.xtdb/xtdb-http-server "1.24.1"]
+                 [com.xtdb/xtdb-core "1.24.4"]
+                 [com.xtdb/xtdb-rocksdb "1.24.4"]
+                 [com.xtdb/xtdb-jdbc "1.24.4"]
+                 [com.xtdb/xtdb-http-server "1.24.4"]
                  [ch.qos.logback/logback-classic "1.2.3"]
                  [org.slf4j/slf4j-api "1.7.36"]]
   :jvm-opts ["-Dlogback.configurationFile=resources/logback.xml"]

diff --git a/src/xtdb_http_multinode/core.clj b/src/xtdb_http_multinode/core.clj
@@ -305,7 +305,8 @@
   (if (get nodes name)
     ;; Node was already added, so we can just return nodes
     nodes
-    (let [node-config {:xtdb/index-store {:kv-store {:xtdb/module `rocks/->kv-store,
+    (let [config (or (System/getenv "XTDB_DATA_DIR") "/var/lib/xtdb")
+          node-config {:xtdb/index-store {:kv-store {:xtdb/module `rocks/->kv-store,
                                                      :db-dir (io/file node-dir name "indexes"),
                                                      :block-cache :xtdb.rocksdb/block-cache}}
                        :xtdb/document-store {:kv-store {:xtdb/module `rocks/->kv-store,

diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -4,11 +4,11 @@
 #
 #    pip-compile requirements.in
 #
-certifi==2023.7.22
+certifi==2024.7.4
     # via requests
 charset-normalizer==3.2.0
     # via requests
-idna==3.4
+idna==3.7
     # via requests
 iniconfig==2.0.0
     # via pytest
@@ -20,5 +20,5 @@ pytest==7.4.0
     # via -r requirements.in
 requests==2.32.2
     # via -r requirements.in
-urllib3==2.0.4
+urllib3==2.2.2
     # via requests