Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

src: add commit hash shorthand in zlib version #50158

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/node_metadata.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "uv.h"
#include "uvwasi.h"
#include "v8.h"
#include "zlib.h"
#include "zlib_version.h"

#if HAVE_OPENSSL
#include <openssl/opensslv.h>
Expand Down
6 changes: 6 additions & 0 deletions src/zlib_version.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// This is an auto generated file, please do not edit.
// Refer to tools/dep_updaters/update-zlib.sh
#ifndef SRC_ZLIB_VERSION_H_
#define SRC_ZLIB_VERSION_H_
#define ZLIB_VERSION "1.2.13.1-motley-fef5869"
#endif // SRC_ZLIB_VERSION_H_
12 changes: 11 additions & 1 deletion tools/dep_updaters/update-zlib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,17 @@ VERSION_NUMBER=$(grep "#define ZLIB_VERSION" "$DEPS_DIR/zlib/zlib.h" | sed -n "s

NEW_VERSION="$VERSION_NUMBER-$LATEST_COMMIT"

# update version information in src/zlib_version.h
cat > "$ROOT/src/zlib_version.h" <<EOF
// This is an auto generated file, please do not edit.
// Refer to tools/dep_updaters/update-zlib.sh
#ifndef SRC_ZLIB_VERSION_H_
#define SRC_ZLIB_VERSION_H_
#define ZLIB_VERSION "$NEW_VERSION"
#endif // SRC_ZLIB_VERSION_H_
EOF

# Update the version number on maintaining-dependencies.md
# and print the new version as the last line of the script as we need
# to add it to $GITHUB_ENV variable
finalize_version_update "zlib" "$NEW_VERSION"
finalize_version_update "zlib" "$NEW_VERSION" "src/zlib_version.h"
Loading