Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove platform ID from debian version #8

Merged
merged 3 commits into from
Oct 10, 2024
+9 −12
Merged

Remove platform ID from debian version #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
588a57d
Remove platform ID from debian version and enabled version preservati…
ep-tpstevens Oct 9, 2024
87b29e6
Fix version in accordance with debian docs
ep-tpstevens Oct 9, 2024
5f147f7
Re-added copy of all debian artifacts for debugging
ep-tpstevens Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
nnstreamer (2.4.1+1.0.0) jammy; urgency=medium
nnstreamer (2.4.1-1.0.0) jammy; urgency=medium

* Add support for aarch64 builds
* Add more flexible build infrastructure across debuild and Jenkins
* Add more flexible build infrastructure across debuild and Jenkins

-- Tyler Stevens <[email protected]> Fri, 04 Oct 2024 16:42:30 -0700
-- Tyler Stevens <[email protected]> Wed, 09 Oct 2024 16:10:03 -0700

nnstreamer (2.4.1+nmu4) UNRELEASED; urgency=medium

Expand Down
3 changes: 0 additions & 3 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,6 @@ endif
override_dh_auto_install:
DESTDIR=$(CURDIR)/debian/tmp ninja -C ${BUILDDIR} install

override_dh_gencontrol:
dh_gencontrol -- -v$(VERSION)~$(EYEPOP_PLATFORM)

override_dh_install:
ifeq ($(EYEPOP_PLATFORM),linux-aarch64-jammy)
dh_install --sourcedir=debian/tmp --list-missing --package=nnstreamer --package=nnstreamer-core --package=nnstreamer-configuration --package=nnstreamer-single --package=nnstreamer-tensorflow2-lite --package=nnstreamer-dev --package=nnstreamer-dev-internal --package=nnstreamer-single-dev --package=nnstreamer-single-dev-internal --package=nnstreamer-test-dev --package=nnstreamer-util --package=nnstreamer-misc --package=nnstreamer-datarepo
Expand Down
12 changes: 6 additions & 6 deletions jenkins/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ pipeline {

stage('Configure') {
steps {
runShellCommand("sudo apt update && sudo apt install -y eyepop-tflite=3.0.0~linux-amd64-jammy-cuda eyepop-torchvision=3.0.0~linux-amd64-jammy-cuda")
runShellCommand("sudo apt update && sudo apt install -y eyepop-tflite=3.0.0 eyepop-torchvision=3.0.0")
runShellCommand("meson -Dwerror=false -Donnxruntime-support=enabled -Dtf-support=enabled -Dcaffe2-support=disabled -Dpython3-support=disabled build/ -Denable-test=false")
}
}
Expand All @@ -68,7 +68,7 @@ pipeline {
steps {
runShellCommand('uname -a && mkdir -p ./build.debian/linux_amd64/')
runShellCommand('DEB_BUILD_OPTIONS="nocheck notest" debuild -b -us -uc -Plinux-amd64-jammy')
runShellCommand('mv ../nnstreamer*.deb ../nnstreamer*.ddeb ./build.debian/linux_amd64/ && ls -la ./build.debian/linux_amd64/')
runShellCommand('mv ../nnstreamer*.deb ../nnstreamer*.ddeb ../nnstreamer*.build ../nnstreamer*.buildinfo ../nnstreamer*.changes ./build.debian/linux_amd64/ && ls -la ./build.debian/linux_amd64/')
}
}
stage('Debian publish') {
Expand All @@ -80,7 +80,7 @@ pipeline {
steps {
withAWS(credentials:'repo-uploader', region: 'us-east-1') {
script {
runShellCommand("deb-s3 upload --bucket repo.dev.eyepop.xyz ./build.debian/linux_amd64/*.deb")
runShellCommand("deb-s3 upload --preserve-versions --bucket repo.dev.eyepop.xyz ./build.debian/linux_amd64/*.deb")
}
}
}
Expand Down Expand Up @@ -119,7 +119,7 @@ pipeline {

stage('Configure') {
steps {
runShellCommand("sudo apt update && sudo apt install -y eyepop-tflite=3.0.0~linux-aarch64-jammy libgtest-dev")
runShellCommand("sudo apt update && sudo apt install -y eyepop-tflite=3.0.0 libgtest-dev")
runShellCommand("meson -Dwerror=false -Donnxruntime-support=disabled -Dtf-support=disabled -Dcaffe2-support=disabled -Dpython3-support=disabled build/ -Denable-test=false")
}
}
Expand All @@ -144,7 +144,7 @@ pipeline {
steps {
runShellCommand('uname -a && mkdir -p ./build.debian/linux_aarch64/')
runShellCommand('DEB_BUILD_OPTIONS="nocheck notest" debuild -b -us -uc -Plinux-aarch64-jammy')
runShellCommand('mv ../nnstreamer*.deb ../nnstreamer*.ddeb ./build.debian/linux_aarch64/ && ls -la ./build.debian/linux_aarch64/')
runShellCommand('mv ../nnstreamer*.deb ../nnstreamer*.ddeb ../nnstreamer*.build ../nnstreamer*.buildinfo ../nnstreamer*.changes ./build.debian/linux_aarch64/ && ls -la ./build.debian/linux_aarch64/')
}
}
stage('Debian publish') {
Expand All @@ -156,7 +156,7 @@ pipeline {
steps {
withAWS(credentials:'repo-uploader', region: 'us-east-1') {
script {
runShellCommand("deb-s3 upload --bucket repo.dev.eyepop.xyz ./build.debian/linux_aarch64/*.deb")
runShellCommand("deb-s3 upload --preserve-versions --bucket repo.dev.eyepop.xyz ./build.debian/linux_aarch64/*.deb")
}
}
}
Expand Down
Loading