Debian repository: override section and priority fields
Those field are not added to the dsc file and reprepro has started
failing. Reproducing the whole set-up is almost impossible so I
am sending this and will trigger a test release.
Also use release label instead of release name so we get the rc
number (for some reason this was not included in previous release).
Fixes #2256.
To be cherry-picked for #2246
--
Change-Id: Ia0b879a24f1288cbbbb843013d41725fb1ddb569
Reviewed-on: https://cr.bazel.build/8032
PiperOrigin-RevId: 142537787
MOS_MIGRATED_REVID=142537787
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
index 005e684..3a4fc66 100755
--- a/scripts/ci/build.sh
+++ b/scripts/ci/build.sh
@@ -346,8 +346,15 @@
basedir .
EOF
- touch conf/override.stable
- touch conf/override.testing
+ # TODO(#2264): this is a quick workaround #2256, figure out a correct fix.
+ cat > conf/override.stable <<EOF
+bazel Section contrib/devel
+bazel Priority optional
+EOF
+ cat > conf/override.testing <<EOF
+bazel Section contrib/devel
+bazel Priority optional
+EOF
ensure_gpg_secret_key_imported
@@ -388,8 +395,8 @@
local release_label="$(get_full_release_name)"
local deb_pkg_name_jdk8="${release_name}/bazel_${release_label}-linux-x86_64.deb"
local deb_pkg_name_jdk7="${release_name}/bazel_${release_label}-jdk7-linux-x86_64.deb"
- local deb_dsc_name="${release_name}/bazel_$(get_release_name).dsc"
- local deb_tar_name="${release_name}/bazel_$(get_release_name).tar.gz"
+ local deb_dsc_name="${release_name}/bazel_${release_label}.dsc"
+ local deb_tar_name="${release_name}/bazel_${release_label}.tar.gz"
cp "${tmpdir}/bazel_${release_label}-linux-x86_64.deb" "${dir}/${deb_pkg_name_jdk8}"
cp "${tmpdir}/bazel_${release_label}-jdk7-linux-x86_64.deb" "${dir}/${deb_pkg_name_jdk7}"
cp "${tmpdir}/bazel.dsc" "${dir}/${deb_dsc_name}"