Skip to content

Commit

Permalink
Merge branch 'trs/augur-release-version'
Browse files Browse the repository at this point in the history
  • Loading branch information
tsibley committed May 23, 2022
2 parents 3360407 + c256a30 commit 163cba5
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
curl \
git \
jq \
libgmp-dev \
libpng-dev \
nodejs \
Expand Down Expand Up @@ -76,14 +77,14 @@ RUN pip3 install google-cloud-storage==2.1.0
# docker build --build-arg CACHE_DATE="$(date)"
ARG CACHE_DATE

# Add download helper
COPY devel/download-repo /devel/
# Add helpers for build
COPY devel/download-repo devel/latest-augur-release-tag /devel/

# Fauna
RUN /devel/download-repo https://github.com/nextstrain/fauna master /nextstrain/fauna

# Augur
RUN /devel/download-repo https://github.com/nextstrain/augur release /nextstrain/augur
RUN /devel/download-repo https://github.com/nextstrain/augur "$(/devel/latest-augur-release-tag)" /nextstrain/augur

# Auspice
RUN /devel/download-repo https://github.com/nextstrain/auspice release /nextstrain/auspice
Expand Down
11 changes: 11 additions & 0 deletions devel/latest-augur-release-tag
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash
#
# Outputs the Git tag for the latest stable release of Augur, supplanting the
# old "release" branch which no longer exists.
#
# By convention/process we make Git tags for each version released to PyPI, so
# query PyPI's index for the latest stable version and emit that as-is.
#
set -euo pipefail

curl -fsSL https://pypi.org/pypi/nextstrain-augur/json | jq -r .info.version

0 comments on commit 163cba5

Please sign in to comment.