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.

Sign up for GitHub

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

Jump to bottom

[CI] Fix macOS build #1837

Merged
merged 1 commit into from
Mar 15, 2024
Merged

[CI] Fix macOS build #1837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ http_archive(
patch_args = ["-p1"],
patches = [
"//:patches/sqlite/0001-row-counts-plain.patch",
"//:patches/sqlite/0002-macOS-missing-PATH-fix.patch",
],
sha256 = "ab9aae38a11b931f35d8d1c6d62826d215579892e6ffbf89f20bdce106a9c8c5",
strip_prefix = "sqlite-src-3440000",
Expand Down
19 changes: 19 additions & 0 deletions patches/sqlite/0002-macOS-missing-PATH-fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --color -u5 -r sqlite-src-3440000-pristine/tool/mksqlite3c.tcl sqlite-src-3440000-modified/tool/mksqlite3c.tcl
--- sqlite-src-3440000-pristine/tool/mksqlite3c.tcl 2023-11-01 07:31:37
+++ sqlite-src-3440000-modified/tool/mksqlite3c.tcl 2024-03-14 17:36:55
@@ -84,11 +84,14 @@
set fname sqlite3.c
if {$enable_recover} { set fname sqlite3r.c }
set out [open $fname w]
# Force the output to use unix line endings, even on Windows.
fconfigure $out -translation lf
-set today [clock format [clock seconds] -format "%Y-%m-%d %H:%M:%S UTC" -gmt 1]
+# The command below results in "couldn't find HOME environment variable to
+# expand path" errors on macOS CI runs. today is unused, so it is safe to
+# comment it out.
+# set today [clock format [clock seconds] -format "%Y-%m-%d %H:%M:%S UTC" -gmt 1]
puts $out [subst \
{/******************************************************************************
** This file is an amalgamation of many separate C source files from SQLite
** version $VERSION. By combining all the individual C code files into this
** single large file, the entire code can be compiled as a single translation
Loading