-
Notifications
You must be signed in to change notification settings - Fork 6
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
Add the SQLite CLI for augur merge
#232
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oh, ugh. Our images are based on Debian Bullseye (currently "oldstable"), which packages SQLite 3.34, but I can either
|
Throwing #233 (option 1) at the wall to see what sticks. |
Option 2 probably looks something like this: diff --git a/Dockerfile b/Dockerfile
index e804b8c..0af2117 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -109,6 +109,17 @@ RUN curl -fsSL https://api.github.com/repos/vcftools/vcftools/tarball/1cab5204eb
&& cp -rp built/bin/* /final/bin \
&& cp -rp built/share/* /final/share
+# Build SQLite CLI
+WORKDIR /build/sqlite
+RUN curl -fsSL --proto 'https=' https://sqlite.org/2024/sqlite-autoconf-3460100.tar.gz \
+ | tar xzvpf - --no-same-owner --strip-components=1 \
+ && CFLAGS="-Os" ./configure --prefix=$PWD/built \
+ --build=$(TARGETPLATFORM= xx-clang --print-target-triple) \
+ --host=$(xx-clang --print-target-triple) \
+ && make && make install \
+ && cp -rp built/bin/* /final/bin \
+ && cp -rp built/share/* /final/share
+
# 2. Download pre-built programs
|
tsibley
force-pushed
the
trs/sqlite-cli
branch
2 times, most recently
from
September 4, 2024 19:39
1c2a6d6
to
94cb0ec
Compare
tsibley
force-pushed
the
trs/debian-bookworm
branch
from
September 4, 2024 20:09
4d2c0c6
to
b7bc9b9
Compare
tsibley
force-pushed
the
trs/sqlite-cli
branch
from
September 4, 2024 20:11
94cb0ec
to
ce4fbd0
Compare
tsibley
force-pushed
the
trs/debian-bookworm
branch
from
September 5, 2024 05:40
b7bc9b9
to
b8c98e8
Compare
tsibley
force-pushed
the
trs/sqlite-cli
branch
2 times, most recently
from
September 5, 2024 06:34
b0992c0
to
eca3433
Compare
tsibley
force-pushed
the
trs/debian-bookworm
branch
from
September 5, 2024 06:34
b8c98e8
to
97d6efc
Compare
Option 1 in #233 is going to work, it seems, without too much additional effort (and it's effort we'd want/need to do eventually anyway). |
Ideally this would have been added before or as Augur 25.3.0—the first version to include `augur merge`—was packaged into this runtime, but I plain forgot.
tsibley
force-pushed
the
trs/sqlite-cli
branch
from
September 5, 2024 18:54
eca3433
to
a3f0eaf
Compare
tsibley
force-pushed
the
trs/debian-bookworm
branch
from
September 5, 2024 18:54
97d6efc
to
82c12ba
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ideally this would have been added before or as Augur 25.3.0—the first version to include
augur merge
—was packaged into this runtime, but I plain forgot.Checklist