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

Jump to bottom

Fix Debian 12 builds #257

Merged
merged 1 commit into from
Oct 16, 2023
Merged

Fix Debian 12 builds #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
ood_packaging (0.13.0)
ood_packaging (0.13.1)
rake (~> 13.0.1)

GEM
Expand Down
2 changes: 1 addition & 1 deletion lib/ood_packaging/build_box/docker-image/Dockerfile.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RUN apt update -y && apt install -y apt-transport-https ca-certificates \
init debhelper devscripts dh-make build-essential apt-cudf lintian equivs \
sudo rake wget curl ruby bundler && \
apt clean all -y
<% if arch != 'ppc64le' %>
<% if ! ['bookworm'].include?(codename) && arch != 'ppc64le' %>
RUN echo "deb https://deb.nodesource.com/node_<%= nodejs_version %>.x <%= codename %> main" > /etc/apt/sources.list.d/nodesource.list
RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nodesource.gpg
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion lib/ood_packaging/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Version code for OodPackaging
module OodPackaging
VERSION = '0.13.0'
VERSION = '0.13.1'
PACKAGE_VERSION = {
'ondemand-release' => {
'(ubuntu|debian)' => '3.1.0',
Expand Down
4 changes: 2 additions & 2 deletions packages/ondemand-release-latest/deb/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
# You must remove unused comment lines for the released package.
export DH_VERBOSE = 1
export CODENAME = $(shell lsb_release -sc)
export CODENAME = $(shell lsb_release -sc 2>/dev/null)
export WEB_DESTDIR = $(CURDIR)/debian/ondemand-release-web-latest
export DEB_BUILD_OPTIONS=nocheck
export NODEREPO=node_18.x
Expand All @@ -21,7 +21,7 @@ override_dh_auto_install:
echo "deb https://apt.osc.edu/ondemand/latest/web/apt $(CODENAME) main" > $(WEB_DESTDIR)/etc/apt/sources.list.d/ondemand-web.list
install -m 644 -D $(CURDIR)/ondemand.gpg $(WEB_DESTDIR)/etc/apt/trusted.gpg.d/ondemand-web.gpg
# Debian 12 (bookworm) has NodeJS 18 in OS repos
ifeq ($(CODENAME),"bookworm")
ifeq ($(CODENAME),bookworm)
else
echo "deb https://deb.nodesource.com/$(NODEREPO) $(CODENAME) main" > $(WEB_DESTDIR)/etc/apt/sources.list.d/nodesource.list
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor > $(WEB_DESTDIR)/etc/apt/trusted.gpg.d/nodesource.gpg
Expand Down
4 changes: 2 additions & 2 deletions packages/ondemand-release/deb/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
# You must remove unused comment lines for the released package.
export DH_VERBOSE = 1
export CODENAME = $(shell lsb_release -sc)
export CODENAME = $(shell lsb_release -sc 2>/dev/null)
export WEB_DESTDIR = $(CURDIR)/debian/ondemand-release-web
export DEB_BUILD_OPTIONS=nocheck
export VERSION_MAJOR = $(shell echo "$(VERSION)" | cut -d'.' -f1)
Expand All @@ -24,7 +24,7 @@ override_dh_auto_install:
echo "deb https://apt.osc.edu/ondemand/$(REPO)/web/apt $(CODENAME) main" > $(WEB_DESTDIR)/etc/apt/sources.list.d/ondemand-web.list
install -m 644 -D $(CURDIR)/ondemand.gpg $(WEB_DESTDIR)/etc/apt/trusted.gpg.d/ondemand-web.gpg
# Debian 12 (bookworm) has NodeJS 18 in OS repos
ifeq ($(CODENAME),"bookworm")
ifeq ($(CODENAME),bookworm)
else
echo "deb https://deb.nodesource.com/$(NODEREPO) $(CODENAME) main" > $(WEB_DESTDIR)/etc/apt/sources.list.d/nodesource.list
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor > $(WEB_DESTDIR)/etc/apt/trusted.gpg.d/nodesource.gpg
Expand Down
Loading