Skip to content

Commit bc9c8a4

Browse files
committed
Review comments, increase timeout and uncomment rpm based jobs
1 parent 471180a commit bc9c8a4

2 files changed

Lines changed: 28 additions & 27 deletions

File tree

.github/workflows/package_linux.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,21 @@ jobs:
8585
needs.check-labels.outputs.force == 'true' ||
8686
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra') ||
8787
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra: Package: Linux')
88-
timeout-minutes: 120
88+
timeout-minutes: 160
8989
strategy:
9090
fail-fast: false
9191
matrix:
9292
id:
93-
# - almalinux-8-amd64
94-
# - almalinux-8-arm64
95-
# - almalinux-9-amd64
96-
# - almalinux-9-arm64
97-
# - almalinux-10-amd64
98-
# - almalinux-10-arm64
99-
# - amazon-linux-2023-amd64
100-
# - amazon-linux-2023-arm64
101-
# - centos-9-stream-amd64
102-
# - centos-9-stream-arm64
93+
- almalinux-8-amd64
94+
- almalinux-8-arm64
95+
- almalinux-9-amd64
96+
- almalinux-9-arm64
97+
- almalinux-10-amd64
98+
- almalinux-10-arm64
99+
- amazon-linux-2023-amd64
100+
- amazon-linux-2023-arm64
101+
- centos-9-stream-amd64
102+
- centos-9-stream-arm64
103103
- debian-bookworm-amd64
104104
- debian-bookworm-arm64
105105
- debian-trixie-amd64
@@ -245,21 +245,6 @@ jobs:
245245
dev/release/utils-watch-gh-workflow.sh \
246246
${GITHUB_REF_NAME} \
247247
release_candidate.yml
248-
- name: Verify Reproducibility
249-
if: env.TASK_NAMESPACE == 'apt'
250-
env:
251-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
252-
run: |
253-
rake -C dev/tasks/linux-packages docker:pull || :
254-
# Validate reproducibility. Reprotest runs the build twice
255-
# inside its own tempdir and doesn't copy artifacts back,
256-
# so this is purely a verification step.
257-
reprotest \
258-
--vary=-fileordering \
259-
--build-command \
260-
"rake -C dev/tasks/linux-packages ${TASK_NAMESPACE}:build" \
261-
"${PWD}" \
262-
"dev/tasks/linux-packages/*/apt/repositories/${DISTRIBUTION}/pool/${DISTRIBUTION_CODE_NAME}/*/*/*/*.deb"
263248
- name: Build
264249
env:
265250
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -349,6 +334,21 @@ jobs:
349334
pushd dev/tasks/linux-packages
350335
rake --trace ${TASK_NAMESPACE}:test
351336
popd
337+
- name: Verify Reproducibility
338+
if: env.TASK_NAMESPACE == 'apt'
339+
env:
340+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
341+
run: |
342+
rake -C dev/tasks/linux-packages docker:pull || :
343+
# Validate reproducibility. Reprotest runs the build twice
344+
# inside its own tempdir and doesn't copy artifacts back,
345+
# so this is purely a verification step.
346+
reprotest \
347+
--vary=-fileordering \
348+
--build-command \
349+
"rake -C dev/tasks/linux-packages ${TASK_NAMESPACE}:build" \
350+
"${PWD}" \
351+
"dev/tasks/linux-packages/*/apt/repositories/${DISTRIBUTION}/pool/${DISTRIBUTION_CODE_NAME}/*/*/*/*.deb"
352352
353353
report-package-linux:
354354
if: github.event_name == 'schedule' && always()

dev/tasks/linux-packages/apt/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,11 @@ if which ccache > /dev/null 2>&1; then
8484
debuild_options+=(--prepend-path=/usr/lib/ccache)
8585
fi
8686
fi
87-
# Use a fixed build directory name instead of mktemp's random suffix.
87+
# Temporarily use a fixed build directory name instead of mktemp's random suffix.
8888
# c_glib's meson generates pkgconfig files that bake the absolute
8989
# build-tree path into Libs.private, so a random suffix breaks
9090
# reproducibility across reprotest runs.
91+
# TODO: Move to a random subdirectory, see: GH-49987
9192
build_dir="${build_root_dir}/package"
9293
run mkdir -p "${build_dir}"
9394
run pushd "${build_dir}"

0 commit comments

Comments
 (0)