From 9253f46c80572cfc40714b152f26a3482d8af577 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Fri, 3 Oct 2025 08:03:16 +0000
Subject: [PATCH] ci: Dedup the nix package job with the other distro package
 jobs.

Signed-off-by: Jason Volk <jason@zemos.net>
---
 .github/workflows/package.yml | 43 ++++++-----------------------------
 docker/Dockerfile.nix         |  6 ++---
 2 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 08574e2d..e60bbdab 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -147,41 +147,6 @@ jobs:
           }
         }
 
-  nix:
-    if: >
-      !failure() && !cancelled()
-      && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0])
-      && contains(fromJSON(inputs.cargo_profiles), fromJSON('["release"]')[0])
-      && contains(fromJSON(inputs.rust_toolchains), fromJSON('["stable"]')[0])
-      && fromJSON(inputs.build_pkgs)
-      && fromJSON(inputs.build_nix)
-      && false
-
-    name: NixOS Package
-    uses: ./.github/workflows/bake.yml
-    with:
-      bake_targets: '["nix"]'
-      cargo_profiles: '["release"]'
-      feat_sets: '["all"]'
-      rust_toolchains: '["stable"]'
-      sys_names: ${{inputs.sys_names}}
-      sys_versions: ${{inputs.sys_versions}}
-      rust_targets: ${{inputs.rust_targets}}
-      sys_targets: ${{inputs.sys_targets}}
-      machines: ${{inputs.machines}}
-      excludes: ${{inputs.excludes}}
-      includes: ${{inputs.includes}}
-      release_url: ${{inputs.release_url}}
-      artifact: >
-        {
-          "nix": {
-            "dst": "tuwunel.drv.tar.zst",
-            "src": "/opt/tuwunel/tuwunel.drv"
-            "mime": "application/zstd",
-            "zstd": 6,
-          },
-        }
-
   pkgs:
     if: >
       !failure() && !cancelled()
@@ -193,7 +158,7 @@ jobs:
     name: Distro Packages
     uses: ./.github/workflows/bake.yml
     with:
-      bake_targets: '["deb", "rpm"]'
+      bake_targets: '["deb", "rpm", "nix"]'
       cargo_profiles: '["release"]'
       feat_sets: '["all"]'
       rust_toolchains: '["stable"]'
@@ -214,6 +179,12 @@ jobs:
           "rpm": {
             "dst": "tuwunel.rpm",
             "mime": "application/x-rpm"
+          },
+          "nix": {
+            "dst": "tuwunel.drv.tar.zst",
+            "src": "/opt/tuwunel/tuwunel.drv"
+            "mime": "application/zstd",
+            "zstd": 6,
           }
         }
 
diff --git a/docker/Dockerfile.nix b/docker/Dockerfile.nix
index 005560ee..ab7fa8f4 100644
--- a/docker/Dockerfile.nix
+++ b/docker/Dockerfile.nix
@@ -52,7 +52,7 @@ ARG sys_target
 WORKDIR /
 COPY --link --from=build-nix . .
 
-WORKDIR /tmp/tuwunel
+WORKDIR /opt/tuwunel
 ENV TUWUNEL_DATABASE_PATH="/tmp/tuwunel/smoketest.db"
 ENV TUWUNEL_LOG="info"
 RUN \
@@ -62,8 +62,6 @@ RUN \
 <<EOF
     set -eux
 
-    #TODO: result disappeared after doCheck disabled?
-    exit 0;
     bin/tuwunel \
         -Otest='["smoke", "fresh"]' \
         -Oserver_name=\"localhost\" \
@@ -86,4 +84,6 @@ RUN \
 <<EOF
 	set -eux
     #TODO: extract derivation?
+    mkdir -p /opt/tuwunel
+    touch /opt/tuwunel/tuwunel.drv
 EOF