Skip to content

Commit

Permalink
Merge pull request #705 from streeve/fixup_heffte_source
Browse files Browse the repository at this point in the history
Use heFFTe GitHub in CI
  • Loading branch information
streeve authored Oct 18, 2023
2 parents 0bcc5b6 + 907ac24 commit 24bda58
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,11 @@ jobs:
cmake --install build
- name: Checkout heffte
if: ${{ matrix.heffte != 'OFF' }}
# actions/checkout doesn't work for external repos yet (actions/checkout#447)
run: |
git clone --depth 1 --branch v2.3.0 https://bitbucket.org/icl/heffte.git heffte
uses: actions/checkout@v3
with:
repository: icl-utk-edu/heffte
ref: v2.3.0
path: heffte
- name: Build heffte
if: ${{ matrix.heffte != 'OFF' }}
working-directory: heffte
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ RUN FFTW_URL=http://www.fftw.org/fftw-${FFTW_VERSION}.tar.gz && \
# Install heffte
ARG HEFFTE_VERSION=2.3.0
ENV HEFFTE_DIR=/opt/heffte
RUN HEFFTE_URL=https://bitbucket.org/icl/heffte/get/v${HEFFTE_VERSION}.tar.gz && \
RUN HEFFTE_URL=https://github.com/icl-utk-edu/heffte/archive/v${HEFFTE_VERSION}.tar.gz && \
HEFFTE_ARCHIVE=heffte.tar.gz && \
SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
wget --quiet ${HEFFTE_URL} --output-document=${HEFFTE_ARCHIVE} && \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.hipcc
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ RUN FFTW_URL=http://www.fftw.org/fftw-${FFTW_VERSION}.tar.gz && \
# Install heffte
ARG HEFFTE_VERSION=2.3.0
ENV HEFFTE_DIR=/opt/heffte
RUN HEFFTE_URL=https://bitbucket.org/icl/heffte/get/v${HEFFTE_VERSION}.tar.gz && \
RUN HEFFTE_URL=https://github.com/icl-utk-edu/heffte/archive/v${HEFFTE_VERSION}.tar.gz && \
HEFFTE_ARCHIVE=heffte.tar.gz && \
SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
wget --quiet ${HEFFTE_URL} --output-document=${HEFFTE_ARCHIVE} && \
Expand Down

0 comments on commit 24bda58

Please sign in to comment.