Detect current version in CI build-dkms

tenstorrent · May 9, 2024 · f4d43b3 · f4d43b3
1 parent 7b7e8f3
commit f4d43b3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
         sudo apt update
         sudo apt install -y dkms
         sudo dkms add .
-        sudo dkms install tenstorrent/1.27.1
+        sudo dkms install tenstorrent/$(tools/current-version)
 
   build-make:
     strategy:
@@ -34,4 +34,4 @@ jobs:
     - uses: actions/upload-artifact@v4
       with:
         name: driver-${{ matrix.os }}
-        path: tenstorrent.ko
+        path: tenstorrent.ko
diff --git a/tools/current-version b/tools/current-version
@@ -0,0 +1,6 @@
+#! /bin/bash
+
+# SPDX-FileCopyrightText: © 2024 Tenstorrent Inc.
+# SPDX-License-Identifier: GPL-2.0-only
+
+sed -nE "s/^[[:space:]]*PACKAGE_VERSION[[:space:]]*=[[:space:]]*\"([^\"]+)\"/\\1/p" dkms.conf
diff --git a/tools/make-installer b/tools/make-installer
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-# SPDX-FileCopyrightText: © 2023 Tenstorrent Inc.
+# SPDX-FileCopyrightText: © 2024 Tenstorrent Inc.
 # SPDX-License-Identifier: GPL-2.0-only
 
 set -e
@@ -32,7 +32,7 @@ if (( ($deploy_motor && $# > 0) || (!$deploy_motor && $# != 1) )); then
     exit 1
 fi
 
-package_version=$(sed -nE "s/^[[:space:]]*PACKAGE_VERSION[[:space:]]*=[[:space:]]*\"([^\"]+)\"/\\1/p" dkms.conf)
+package_version=$(tools/current-version)
 archive=$(tools/make-source-release -m)
 archive_basename=$(basename "$archive")