Skip to content

Commit 24b849e

Browse files
committed
bump SQLite & zstd
1 parent 74da991 commit 24b849e

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ env:
55
APT_DEPS: libzstd-dev samtools tabix libhts-dev pigz python3-pip libcurl4-openssl-dev
66
BREW_DEPS: python@3.8 sqlite zstd samtools pigz coreutils
77
PIP_DEPS: pytest pytest-xdist
8-
SQLITE_VERSION: 3340000
98

109
jobs:
1110

@@ -75,7 +74,7 @@ jobs:
7574
rm build/libgenomicsqlite.so
7675
sudo apt-get remove -y libzstd-dev # should be linked into libgenomicsqlite.so
7776
- name: build portable .so in docker
78-
run: docker build --build-arg "SQLITE_VERSION=${SQLITE_VERSION}" -t genomicsqlite . && docker run -v $(pwd):/mnt --rm genomicsqlite cp /usr/local/lib/{libgenomicsqlite.so,libsqlite3.so.0} /mnt/build/
77+
run: docker build -t genomicsqlite . && docker run -v $(pwd):/mnt --rm genomicsqlite cp /usr/local/lib/{libgenomicsqlite.so,libsqlite3.so.0} /mnt/build/
7978
- name: symbols & digests
8079
run: |
8180
readelf -d build/libgenomicsqlite.so

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
FROM centos:7 as builder
55

66
ARG CMAKE_VERSION=3.17.3
7-
ARG SQLITE_VERSION=3340000
8-
ARG ZSTD_VERSION=1.4.8
7+
ARG SQLITE_VERSION=3350500
8+
ARG ZSTD_VERSION=1.5.0
99
ARG CPU_ARCH=ivybridge
1010
ENV CFLAGS="-march=${CPU_ARCH} -O3"
1111
ENV CXXFLAGS=${CFLAGS}
@@ -35,7 +35,7 @@ RUN mkdir -p /work/GenomicSQLite
3535

3636
# SQLite
3737
WORKDIR /work
38-
RUN wget -nv https://www.sqlite.org/2020/sqlite-amalgamation-${SQLITE_VERSION}.zip \
38+
RUN wget -nv https://www.sqlite.org/2021/sqlite-amalgamation-${SQLITE_VERSION}.zip \
3939
&& unzip -o sqlite-amalgamation-${SQLITE_VERSION}.zip
4040
WORKDIR /work/sqlite-amalgamation-${SQLITE_VERSION}
4141
RUN bash -c "scl enable devtoolset-8 'gcc -shared -o libsqlite3.so.0 -fPIC -shared -Wl,-soname,libsqlite3.so.0 -g ${CFLAGS} ${SQLITE_CFLAGS} sqlite3.c' & pid=$? \

0 commit comments

Comments
 (0)