Merge pull request #126 from morisja/pr-120

twosigma · Oct 10, 2024 · eb9b2a7 · eb9b2a7
2 parents cf94e3c + a88c66a
commit eb9b2a7
Show file tree

Hide file tree

Showing 6 changed files with 889 additions and 29 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,26 +13,44 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  build-test:
+
+  build-debian-11:
     runs-on: ubuntu-latest
+    container: debian:11
 
     steps:
       - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          apt-get update
+          apt-get -y install build-essential dpkg-dev ca-certificates sudo curl
+          apt-get -y build-dep .
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: ${{ github.event.schedule && 'nightly' || 'stable' }}
       - name: Build
         run: cargo build --verbose
-      - name: Run tests
-        run: cargo test --verbose
 
-  build-debian:
-    strategy:
-      matrix:
-        debian-version: [11, 12]
+  build-debian-12:
+    runs-on: ubuntu-latest
+    container: debian:12
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          apt-get update
+          apt-get -y install build-essential dpkg-dev ca-certificates sudo curl
+          apt-get -y build-dep .
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: ${{ github.event.schedule && 'nightly' || 'stable' }}
+      - name: Build
+        run: cargo build --verbose
 
+  build-debian-13:
     runs-on: ubuntu-latest
-    container: debian:${{ matrix.debian-version }}
+    container: debian:trixie
 
     steps:
       - uses: actions/checkout@v4
@@ -61,7 +79,8 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-  build-debian-package:
+
+  build-debian-package-11:
     runs-on: ubuntu-latest
     container: debian:11
 
@@ -85,34 +104,126 @@ jobs:
         working-directory: clone
       - uses: actions/upload-artifact@v3
         with:
-          name: deb-package
+          name: deb-package-debian-11
+          path: |
+            ./*
+            !./clone/**
+
+  build-debian-package-12:
+    runs-on: ubuntu-latest
+    container: debian:12
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: clone
+      - name: Install dependencies
+        run: |
+          apt-get update
+          apt-get install -y build-essential dpkg-dev ca-certificates sudo curl
+          cd clone
+          apt-get build-dep -y .
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: ${{ github.event.schedule && 'nightly' || 'stable' }}
+      - name: Build package
+        run: |
+          debian/rules vendor
+          dpkg-buildpackage --no-sign
+        working-directory: clone
+      - uses: actions/upload-artifact@v3
+        with:
+          name: deb-package-debian-12
+          path: |
+            ./*
+            !./clone/**
+
+  build-debian-package-13:
+    runs-on: ubuntu-latest
+    container: debian:trixie
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: clone
+      - name: Install dependencies
+        run: |
+          apt-get update
+          apt-get install -y build-essential dpkg-dev ca-certificates sudo curl
+          cd clone
+          apt-get build-dep -y .
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: ${{ github.event.schedule && 'nightly' || 'stable' }}
+      - name: Build package
+        run: |
+          debian/rules vendor
+          dpkg-buildpackage --no-sign
+        working-directory: clone
+      - uses: actions/upload-artifact@v3
+        with:
+          name: deb-package-debian-13
           path: |
             ./*
             !./clone/**
 
   run-ci-ubuntu-latest:
     runs-on: ubuntu-latest
-    needs: [build-debian-package]
+    needs: [build-debian-package-11, build-debian-package-12, build-debian-package-13]
 
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v3
         with:
-          name: deb-package
+          name: deb-package-debian-12
       - name: CI
         run: ci/test.sh
         env:
           HAVE_SYSTEMD: "1"
 
 
-  run-ci-debian:
-    strategy:
-      matrix:
-        debian-version: [11, 12]
+  run-ci-debian-11:
+    runs-on: ubuntu-latest
+    container: debian:11
+    needs: [build-debian-package-11]
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          apt-get update
+          apt-get -y install build-essential
+      - uses: actions/download-artifact@v3
+        with:
+          name: deb-package-debian-11
+      - name: CI
+        run: ci/test.sh
+        env:
+          HAVE_SYSTEMD: "0"
+
+  run-ci-debian-12:
+    runs-on: ubuntu-latest
+    container: debian:12
+    needs: [build-debian-package-12]
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          apt-get update
+          apt-get -y install build-essential
+      - uses: actions/download-artifact@v3
+        with:
+          name: deb-package-debian-12
+      - name: CI
+        run: ci/test.sh
+        env:
+          HAVE_SYSTEMD: "0"
 
+  run-ci-debian-13:
     runs-on: ubuntu-latest
-    container: debian:${{ matrix.debian-version }}
-    needs: [build-debian-package]
+    container: debian:trixie
+    needs: [build-debian-package-13]
 
     steps:
       - uses: actions/checkout@v4
@@ -122,21 +233,21 @@ jobs:
           apt-get -y install build-essential
       - uses: actions/download-artifact@v3
         with:
-          name: deb-package
+          name: deb-package-debian-13
       - name: CI
         run: ci/test.sh
         env:
           HAVE_SYSTEMD: "0"
 
   create-release:
     runs-on: ubuntu-latest
-    needs: [run-ci-ubuntu-latest, run-ci-debian]
+    needs: [run-ci-ubuntu-latest, run-ci-debian-11, run-ci-debian-12, run-ci-debian-13]
     if: github.event.release
 
     steps:
       - uses: actions/download-artifact@v3
         with:
-          name: deb-package
+          name: deb-package-debian-11
       - uses: softprops/action-gh-release@v2
         with:
           files: "*"

diff --git a/README.md b/README.md
@@ -50,6 +50,8 @@ not respond to the requests related to that database.
 Some request types may be ignored by the implementation (e.g. the ones that
 request a file descriptor pointing into internal cache structures).
 
+`NSNCD_SOCKET_PATH` may be set to override the default location of the socket.
+
 ## Bug Reports and Contributions
 
 Please create GitHub issues and/or pull requests.