galera scripts/build.sh requires dpkg to detect Debian/Ubuntu

MariaDB · Sep 1, 2023 · d927883 · d927883
1 parent 54ad406
commit d927883
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ci_build_images/debian.Dockerfile b/ci_build_images/debian.Dockerfile
@@ -47,6 +47,7 @@ RUN . /etc/os-release; \
     ccache \
     check \
     default-jdk\
+    dpkg \
     dumb-init \
     gawk \
     git \

diff --git a/master-galera/master.cfg b/master-galera/master.cfg
@@ -191,7 +191,7 @@ f_deb_build.addStep(steps.GitHub(
   submodules=True
 ))
 f_deb_build.addStep(steps.ShellCommand(name='build packages', command=["bash", "-xc", util.Interpolate("""set -e
-./scripts/build.sh -p""")], workdir='build'))
+./scripts/build.sh -p""")], workdir='build'), env={'DEBIAN': '1'})
 f_deb_build.addStep(dpkgDeb())
 f_deb_build.addStep(steps.ShellCommand(name='save_packages', timeout=7200, haltOnFailure=True, command=util.Interpolate('mkdir -p ' + '/packages/' + '%(prop:branch)s' + '/' + '%(prop:revision)s' + '/' + '%(prop:buildername)s'+ ' && cp -r debs/ sha256sums.txt /packages/' + '%(prop:branch)s' + '/' + '%(prop:revision)s' + '/' + '%(prop:buildername)s' + '/' +  ' && sync /packages/' + '%(prop:branch)s' + '/' + '%(prop:revision)s'), doStepIf=lambda step: savePackage(step, savedPackageBranches)))
 f_deb_build.addStep(steps.ShellCommand(name="cleanup", command="rm -r * .* 2> /dev/null || true", alwaysRun=True))
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,6 +47,7 @@ RUN . /etc/os-release; \ @@
         ccache \
         check \
         default-jdk\
+        dpkg \
         dumb-init \
         gawk \
         git \
@@ Expand Down @@