Skip to content

Conversation

mlafeldt
Copy link
Member

DuckDB 1.2.2 was the last release that included libduckdb-src.zip.

It was removed in f0e821d and 055334e by accident.

zip -j duckdb_cli-linux-${{ matrix.config.arch }}.zip build/release/duckdb
gzip -9 -k -n -c build/release/duckdb > duckdb_cli-linux-${{ matrix.config.arch }}.gz
zip -j libduckdb-linux-${{ matrix.config.arch }}.zip build/release/src/libduckdb*.* src/amalgamation/duckdb.hpp src/include/duckdb.h
./scripts/upload-assets-to-staging.sh github_release libduckdb-linux-${{ matrix.config.arch }}.zip duckdb_cli-linux-${{ matrix.config.arch }}.zip duckdb_cli-linux-${{ matrix.config.arch }}.gz
zip -j libduckdb-src.zip src/amalgamation/duckdb.hpp src/amalgamation/duckdb.cpp src/include/duckdb.h src/include/duckdb_extension.h
./scripts/upload-assets-to-staging.sh github_release libduckdb-src.zip libduckdb-linux-${{ matrix.config.arch }}.zip duckdb_cli-linux-${{ matrix.config.arch }}.zip duckdb_cli-linux-${{ matrix.config.arch }}.gz
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TBH, I don't know how libduckdb-src.zip will be published as a GitHub release artifact after it's uploaded here.

Also, since this is a matrix job, the file will be uploaded twice. However, AFAICT, this used to be the case in the past too.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then maybe can be explicitly written only in one of the paths? Or maybe better, have a separate step that takes care of putting together sources / run the amalgamation?

@@ -109,10 +109,12 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.S3_DUCKDB_STAGING_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_DUCKDB_STAGING_KEY }}
run: |
python3 scripts/amalgamation.py
zip -j duckdb_cli-linux-${{ matrix.config.arch }}.zip build/release/duckdb
gzip -9 -k -n -c build/release/duckdb > duckdb_cli-linux-${{ matrix.config.arch }}.gz
zip -j libduckdb-linux-${{ matrix.config.arch }}.zip build/release/src/libduckdb*.* src/amalgamation/duckdb.hpp src/include/duckdb.h
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should really fail right now since src/amalgamation/duckdb.hpp won't exist without calling the amalgamation script. 🤔

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I learned that zip treats missing files as a warning - unless -MM is used. 🙈

@mlafeldt mlafeldt self-assigned this Jun 23, 2025
@carlopi
Copy link
Contributor

carlopi commented Jun 23, 2025

Also given I took a look, should this go to v1.3-ossivalis? So that's included in 1.3.2? (if so, needs rebase / cherry-pick and selecting a different target branch)

@mlafeldt mlafeldt changed the base branch from main to v1.3-ossivalis June 24, 2025 10:47
@mlafeldt mlafeldt force-pushed the bring-back-libduckdb-src branch from ecf7b6a to 54a879b Compare June 24, 2025 10:48
@duckdb-draftbot duckdb-draftbot marked this pull request as draft June 24, 2025 10:49
@mlafeldt
Copy link
Member Author

@carlopi I've moved the logic into a separate step and also changed the base branch to v1.3-ossivalis. Let me know what you think.

Be warned that I haven't tested the job yet, but I'd love to see how you usually test changes to the release process without waiting for the next release. 😄

@mlafeldt mlafeldt marked this pull request as ready for review June 24, 2025 11:23
@mlafeldt mlafeldt requested a review from carlopi June 24, 2025 11:23
Copy link
Contributor

@carlopi carlopi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

As to how this is tested, if the CI passes it means it's not breaking anything (and it should not :)), then every night a release process of sort is executed, so this can be checked again in the first night AFTER this is merged in 1.3-ossivalis.

@Mytherin Mytherin merged commit 1643b10 into duckdb:v1.3-ossivalis Jun 24, 2025
14 checks passed
@Mytherin
Copy link
Collaborator

Thanks!

@mlafeldt mlafeldt deleted the bring-back-libduckdb-src branch June 24, 2025 16:10
github-actions bot pushed a commit to duckdb/duckdb-r that referenced this pull request Jun 28, 2025
Issue duckdb/duckdb#18035: Zero Fill TIMESTAMP_NS (duckdb/duckdb#18045)
Bring back libduckdb-src.zip as release artifact (duckdb/duckdb#18019)
github-actions bot added a commit to duckdb/duckdb-r that referenced this pull request Jun 28, 2025
Issue duckdb/duckdb#18035: Zero Fill TIMESTAMP_NS (duckdb/duckdb#18045)
Bring back libduckdb-src.zip as release artifact (duckdb/duckdb#18019)

Co-authored-by: krlmlr <krlmlr@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants