Skip to content

Commit

Permalink
parameterize, but only with one version
Browse files Browse the repository at this point in the history
  • Loading branch information
Phil Varner committed Nov 28, 2023
1 parent 0f9b4fa commit 84f93e1
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 423 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
if: "!contains(github.event.head_commit.message, '[skip ci]')"
strategy:
matrix:
gdal-version: ["3.6.4", "3.7.3", "3.8.0"]
gdal-version: ["3.8.0"]
steps:
- uses: actions/checkout@v4

Expand Down
3 changes: 2 additions & 1 deletion dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@ RUN mkdir /tmp/netcdf \
# We use commit sha to make sure we are not using `cache` when building the docker image
# "7ca88116f5a46d429251361634eb24629f315076" is the latest commit on release/3.6 branch


# GDAL
ARG GDAL_VERSION
RUN mkdir /tmp/gdal \
Expand All @@ -382,8 +383,8 @@ RUN mkdir /tmp/gdal \
&& make -j $(nproc) --silent && make install \
&& rm -rf /tmp/gdal

# patchelf
# from https://github.com/pypa/manylinux/blob/d8ef5d47433ba771fa4403fd48f352c586e06e43/docker/build_scripts/build.sh#L133-L138
# Install patchelf (latest with unreleased bug fixes)
ENV PATCHELF_VERSION=0.10
RUN mkdir /tmp/patchelf \
&& curl -sfL https://github.com/NixOS/patchelf/archive/${PATCHELF_VERSION}.tar.gz | tar zxf - -C /tmp/patchelf --strip-components=1 \
Expand Down
Loading

0 comments on commit 84f93e1

Please sign in to comment.