Skip to content
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.

Sign up for GitHub

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

DO NOT MERGE Test Docker changes #3917

Closed
wants to merge 2 commits into from
Closed

DO NOT MERGE Test Docker changes #3917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbb6079
Remove unnecessary files inside the build layer
ddundo Dec 11, 2024
6da57f5
TEMP changes for CI
ddundo Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,12 @@ jobs:
name: "Build Docker containers"
# Only run on master, but always generate firedrake-env image,
# even if build fails (see docker.yml)
if: ${{ (github.ref == 'refs/heads/master') && always() }}
needs: [build, docker_tag]
# if: ${{ (github.ref == 'refs/heads/master') && always() }}
# needs: [build, docker_tag]
if: ${{ always() }}
uses: ./.github/workflows/docker.yml
with:
tag: ${{ needs.docker_tag.outputs.tag }}
# tag: ${{ needs.docker_tag.outputs.tag }}
tag: testing
status: ${{ needs.build.result }}
secrets: inherit
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
docker_vanilla:
needs: docker_env
# Only run if "Build Firedrake" succeeds
if: ${{ inputs.status == 'success' }}
# if: ${{ inputs.status == 'success' }}
uses: ./.github/workflows/docker_reuse.yml
with:
target: firedrake-vanilla
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
docker_complex:
needs: docker_env
# Only run if "Build Firedrake" succeeds
if: ${{ inputs.status == 'success' }}
# if: ${{ inputs.status == 'success' }}
uses: ./.github/workflows/docker_reuse.yml
with:
target: firedrake-complex
Expand Down
13 changes: 6 additions & 7 deletions docker/Dockerfile.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,14 @@ RUN bash -c 'cd petsc; \
--download-suitesparse \
--download-superlu_dist \
PETSC_ARCH=packages; \
mv packages/include/petscconf.h packages/include/old_petscconf.nope;'
mv packages/include/petscconf.h packages/include/old_petscconf.nope; \
rm -rf /home/firedrake/petsc/**/externalpackages; \
rm -rf /home/firedrake/petsc/src/docs; \
rm -f /home/firedrake/petsc/src/**/tutorials/output/*; \
rm -f /home/firedrake/petsc/src/**/tests/output/*'
# Don't run make here, we only want MPICH and HWLOC
# It is also necessary to move `petscconf.h` so packages isn't treated like a working PETSc
# Cleaned up unnecessary files

# Build default Firedrake PETSc
RUN bash -c 'export PACKAGES=/home/firedrake/petsc/packages; \
Expand Down Expand Up @@ -149,12 +154,6 @@ RUN bash -c 'export PETSC_DIR=/home/firedrake/petsc; \
./configure; \
make SLEPC_DIR=/home/firedrake/slepc PETSC_DIR=/home/firedrake/petsc PETSC_ARCH=complex;'

# Clean up unnecessary files
RUN rm -rf /home/firedrake/petsc/**/externalpackages \
&& rm -rf /home/firedrake/petsc/src/docs \
&& rm -f /home/firedrake/petsc/src/**/tutorials/output/* \
&& rm -f /home/firedrake/petsc/src/**/tests/output/*

# Set some useful environment variables
ENV PETSC_DIR /home/firedrake/petsc
ENV SLEPC_DIR /home/firedrake/slepc
Expand Down
Loading