Skip to content

Commit aca3ac6

Browse files
authored
Merge pull request #775 from apache/tck-test-data-layout
ci: download TCK snapshots from the serialization_test_data layout
2 parents 00c20b3 + f47c763 commit aca3ac6

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

‎.github/workflows/serde-compat.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ jobs:
3030
java-version: '25'
3131
distribution: 'temurin'
3232

33+
# The Java profile generates its own snapshots before checking them.
3334
- name: Download ${{ matrix.name }} snapshots
35+
if: matrix.language != 'java'
3436
run: ./tools/download_serialization_test_data.sh ${{ matrix.language }}
3537

3638
- name: Run Java tests against ${{ matrix.name }} snapshots

‎tools/download_serialization_test_data.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
set -euo pipefail
2121

2222
# Pin the archive so compatibility tests always use an immutable snapshot set.
23-
readonly TCK_REVISION="d363b12d293b395d90abb42677f9ea63178dbc0d"
23+
readonly TCK_REVISION="e748b0a038a17c6d5c771afc4efd9ee35a5a7ec5"
2424
readonly TCK_ARCHIVE_URL="https://api.github.com/repos/apache/datasketches-tck/tarball/${TCK_REVISION}"
2525
readonly SCRIPT_DIRECTORY="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
2626
readonly REPOSITORY_ROOT="$(cd "${SCRIPT_DIRECTORY}/.." && pwd)"
@@ -103,7 +103,7 @@ for language in "${languages[@]}"; do
103103

104104
while IFS= read -r member; do
105105
case "${member}" in
106-
*/serialization/"${language}"/snapshots/*.sk)
106+
*/serialization_test_data/"${language}"_generated_files/*.sk)
107107
name="${member##*/}"
108108
for existing_name in "${names[@]-}"; do
109109
if [[ "${name}" == "${existing_name}" ]]; then
@@ -126,7 +126,7 @@ for language in "${languages[@]}"; do
126126
tar \
127127
-xzf "${archive_path}" \
128128
-C "${staging_directory}" \
129-
--strip-components=4 \
129+
--strip-components=3 \
130130
"${members[@]}"
131131
for name in "${names[@]}"; do
132132
if [[ ! -f "${staging_directory}/${name}" ]]; then

0 commit comments

Comments
 (0)