This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new 66461304b feat(ci/linux-packages): Add support for Debian GNU/Linux
trixie (#3513)
66461304b is described below
commit 66461304b423b8deea75f4575a169a6cb4d76cf4
Author: Sutou Kouhei <[email protected]>
AuthorDate: Fri Oct 3 05:12:33 2025 +0900
feat(ci/linux-packages): Add support for Debian GNU/Linux trixie (#3513)
Closes #3511.
---
.github/workflows/packaging.yml | 1 +
ci/linux-packages/Rakefile | 4 +---
ci/linux-packages/apt/debian-bookworm/Dockerfile | 2 +-
.../{debian-bookworm => debian-trixie}/Dockerfile | 7 +++----
dev/release/verify-apt.sh | 21 ++++++++++-----------
5 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index dc308e04f..35cc860d7 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -373,6 +373,7 @@ jobs:
- almalinux-9
- almalinux-10
- debian-bookworm
+ - debian-trixie
- ubuntu-jammy
- ubuntu-noble
steps:
diff --git a/ci/linux-packages/Rakefile b/ci/linux-packages/Rakefile
index 641126637..ae6a58a38 100644
--- a/ci/linux-packages/Rakefile
+++ b/ci/linux-packages/Rakefile
@@ -130,11 +130,9 @@ class ADBCPackageTask < PackageTask
def apt_targets_default
[
"debian-bookworm",
- # "debian-bookworm-arm64",
+ "debian-trixie",
"ubuntu-jammy",
- # "ubuntu-jammy-arm64",
"ubuntu-noble",
- # "ubuntu-noble-arm64",
]
end
diff --git a/ci/linux-packages/apt/debian-bookworm/Dockerfile
b/ci/linux-packages/apt/debian-bookworm/Dockerfile
index 2b8a3a89a..ac60132d6 100644
--- a/ci/linux-packages/apt/debian-bookworm/Dockerfile
+++ b/ci/linux-packages/apt/debian-bookworm/Dockerfile
@@ -36,7 +36,7 @@ RUN \
ca-certificates \
lsb-release \
wget && \
- wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short |
tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename
--short).deb && \
+ wget https://packages.apache.org/artifactory/arrow/$(lsb_release --id
--short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release
--codename --short).deb && \
apt install -y -V ${quiet} \
./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
rm apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
diff --git a/ci/linux-packages/apt/debian-bookworm/Dockerfile
b/ci/linux-packages/apt/debian-trixie/Dockerfile
similarity index 81%
copy from ci/linux-packages/apt/debian-bookworm/Dockerfile
copy to ci/linux-packages/apt/debian-trixie/Dockerfile
index 2b8a3a89a..98afa1a70 100644
--- a/ci/linux-packages/apt/debian-bookworm/Dockerfile
+++ b/ci/linux-packages/apt/debian-trixie/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-ARG FROM=debian:bookworm
+ARG FROM=debian:trixie
FROM ${FROM}
RUN \
@@ -36,11 +36,10 @@ RUN \
ca-certificates \
lsb-release \
wget && \
- wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short |
tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename
--short).deb && \
+ wget https://packages.apache.org/artifactory/arrow/$(lsb_release --id
--short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release
--codename --short).deb && \
apt install -y -V ${quiet} \
./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
rm apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
- echo "deb http://deb.debian.org/debian $(lsb_release --codename
--short)-backports main" >> /etc/apt/sources.list && \
apt update && \
apt install -y -V ${quiet} \
build-essential \
@@ -49,6 +48,7 @@ RUN \
debhelper \
devscripts \
gobject-introspection \
+ golang \
libarrow-glib-dev \
libgirepository1.0-dev \
libpq-dev \
@@ -58,5 +58,4 @@ RUN \
pkg-config \
tzdata \
valac && \
- apt install -y -V -t $(lsb_release --codename --short)-backports ${quiet}
golang-1.21 && \
apt clean
diff --git a/dev/release/verify-apt.sh b/dev/release/verify-apt.sh
index 7f42385a1..0e0804c6a 100755
--- a/dev/release/verify-apt.sh
+++ b/dev/release/verify-apt.sh
@@ -76,17 +76,11 @@ case "${TYPE}" in
esac
case "${distribution}-${code_name}" in
- debian-bookworm)
- sed \
- -i"" \
- -e "s/ main$/ main contrib non-free/g" \
- /etc/apt/sources.list.d/debian.sources
- ;;
debian-*)
sed \
-i"" \
-e "s/ main$/ main contrib non-free/g" \
- /etc/apt/sources.list
+ /etc/apt/sources.list.d/debian.sources
;;
esac
@@ -117,15 +111,20 @@ fi
if [ "${TYPE}" = "local" ]; then
sed \
-e "s,^URIs: .*$,URIs:
file://${local_prefix}/apt/repositories/${distribution},g" \
- -e "s,^Signed-By: .*$,Signed-By:
/usr/share/keyrings/apache-arrow-adbc-apt-source.gpg,g" \
- /etc/apt/sources.list.d/apache-arrow.sources > \
- /etc/apt/sources.list.d/apache-arrow-adbc.sources
+ -e "s,^Signed-By: .*$,Signed-By:
/usr/share/keyrings/apache-arrow-adbc-apt-source.asc,g" \
+ /etc/apt/sources.list.d/apache-arrow.sources |
+ tee /etc/apt/sources.list.d/apache-arrow-adbc.sources
keys="${local_prefix}/KEYS"
if [ -f "${keys}" ]; then
gpg \
--no-default-keyring \
- --keyring /usr/share/keyrings/apache-arrow-adbc-apt-source.gpg \
+ --keyring /tmp/apache-arrow-adbc-apt-source.kbx \
--import "${keys}"
+ gpg \
+ --no-default-keyring \
+ --keyring /tmp/apache-arrow-adbc-apt-source.kbx \
+ --armor \
+ --export > /usr/share/keyrings/apache-arrow-adbc-apt-source.asc
fi
else
case "${TYPE}" in
