merge conflict

Author: pbrubeck

.github/ISSUE_TEMPLATE/installation.md

@@ -13,7 +13,7 @@ A short description of what the installation error is.
 **Steps to Reproduce**
 Steps to reproduce the behavior:
 
-ie: The exact command used for installation/update  '...'
+ie: The exact command used for installation  '...'
 
 **Expected behavior**
 Describe what you expected to happen.
@@ -23,12 +23,11 @@ Add error message with full backtrace.
 Please add these as text using three backticks (`) for highlighting.
 Please do not add screenshots.
 
-Please also include either `firedrake-install.log` which is found in
-the directory `firedrake-install` was run or `firedrake-update.log`
-found in the virtualenv directory.
+If the issue was with installing PETSc then please share the `configure.log`
+file found inside the `petsc` directory.
 
-Additionally please include the PETSc configure log located in
-`$VIRTUAL_ENV/src/petsc/configure.log`.
+If the issue was with installing Firedrake then please share the output
+of the `pip install` command having passed the extra flag `--verbose`.
 
 **Environment:**
  - OS: [eg: Linux, MacOS, WSL (Windows Subsystem for Linux)] add this as an issue label too! Please be specific: state the Linux distribution or MacOS version you are attempting to install on.

.github/PULL_REQUEST_TEMPLATE/run_ci_only.md

@@ -20,39 +20,12 @@ on:
         required: true
 
 jobs:
-  # Firedrake environment container
-  docker_build_env:
-    strategy:
-      matrix:
-        os: [Linux, macOS]
-        include:
-          - os: Linux
-            platform: linux/amd64
-          - os: macOS
-            platform: linux/arm64
-    uses: ./.github/workflows/docker_build.yml
-    with:
-      os: ${{ matrix.os }}
-      platform: ${{ matrix.platform }}
-      target: firedrake-env
-      tag: ${{ inputs.tag }}
-      dockerfile: docker/Dockerfile.env
-    secrets: inherit
-
-  docker_merge_env:
-    uses: ./.github/workflows/docker_merge.yml
-    needs: docker_build_env
-    with:
-      target: firedrake-env
-      tag: ${{ inputs.tag }}
-    secrets: inherit
-
   # Firedrake container (just Firedrake)
   docker_build_vanilla:
     # Only run if Firedrake tests pass
     if: inputs.status == 'success'
-    needs: docker_merge_env
     strategy:
+      fail-fast: false
       matrix:
         os: [Linux, macOS]
         arch: [default, complex]
@@ -65,6 +38,7 @@ jobs:
     with:
       os: ${{ matrix.os }}
       platform: ${{ matrix.platform }}
+      arch: ${{ matrix.arch }}
       target: firedrake-vanilla-${{ matrix.arch }}
       tag: ${{ inputs.tag }}
       dockerfile: docker/Dockerfile.vanilla
@@ -73,6 +47,7 @@ jobs:
   docker_merge_vanilla:
     needs: docker_build_vanilla
     strategy:
+      fail-fast: false
       matrix:
         arch: [default, complex]
     uses: ./.github/workflows/docker_merge.yml
@@ -107,23 +82,15 @@ jobs:
       tag: ${{ inputs.tag }}
     secrets: inherit
 
-  # # Firedrake container with documentation dependencies and TeX
+  # # Firedrake container with TeX
   docker_build_docdeps:
     # Only run if "Build Firedrake" succeeds
     if: inputs.status == 'success'
     needs: docker_merge_vanilla
-    strategy:
-      matrix:
-        os: [Linux, macOS]
-        include:
-          - os: Linux
-            platform: linux/amd64
-          - os: macOS
-            platform: linux/arm64
     uses: ./.github/workflows/docker_build.yml
     with:
-      os: ${{ matrix.os }}
-      platform: ${{ matrix.platform }}
+      os: Linux
+      platform: linux/amd64
       target: firedrake-docdeps
       tag: ${{ inputs.tag }}
       dockerfile: docker/Dockerfile.docdeps