Merge branch 'release/3.8.1'

uccser · Aug 28, 2021 · a67a27f · a67a27f
2 parents de1bebc + c87cbcd
commit a67a27f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/.github/workflows/test-and-deploy.yaml b/.github/workflows/test-and-deploy.yaml
@@ -96,7 +96,7 @@ jobs:
     name: Create static files
     if: |
       github.ref == 'refs/heads/develop' ||
-      startsWith(github.ref, 'refs/tags/')
+      github.event_name == 'release'
     runs-on: ubuntu-20.04
     needs: [
       test-django-system-check,
@@ -136,7 +136,7 @@ jobs:
     name: Create interactive thumbnails
     if: |
       github.ref == 'refs/heads/develop' ||
-      startsWith(github.ref, 'refs/tags/')
+      github.event_name == 'release'
     runs-on: ubuntu-20.04
     strategy:
       matrix:
@@ -231,7 +231,7 @@ jobs:
 
   publish-prod-docker-image:
     name: Create and publish prod image
-    if: startsWith(github.ref, 'refs/tags/')
+    if: github.event_name == 'release'
     runs-on: ubuntu-20.04
     needs: [
       create-static-files,

diff --git a/csfieldguide/chapters/content/en/computer-vision/sections/depth.md b/csfieldguide/chapters/content/en/computer-vision/sections/depth.md
@@ -28,7 +28,7 @@ An example picture is shown below.
 
 {image file-path="img/chapters/angle-of-view-ruler.jpg" alt="An example of taking a picture of a ruler."}
 
-{image file-path="img/chapters/angle-of-view-ruler.png" alt="A diagram showing the components of the ruler technique."}
+{image file-path="img/chapters/angle-of-view-ruler-diagram.png" alt="A diagram showing the components of the ruler technique."}
 
 As seen in the diagram above, finding the angle of view becomes a simple trigonometry problem.
 We derive the following equation for calculating the half angle of view.

diff --git a/csfieldguide/config/__init__.py b/csfieldguide/config/__init__.py
@@ -1,3 +1,3 @@
 """Module for Django system configuration."""
 
-__version__ = "3.8.0"
+__version__ = "3.8.1"
diff --git a/...atic/img/chapters/angle-of-view-ruler.png → .../chapters/angle-of-view-ruler-diagram.png b/...atic/img/chapters/angle-of-view-ruler.png → .../chapters/angle-of-view-ruler-diagram.png
diff --git a/csfieldguide/static/img/chapters/angle-of-view-ruler.jpg b/csfieldguide/static/img/chapters/angle-of-view-ruler.jpg
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -18,6 +18,16 @@ All notable changes to this project will be documented in this file.
 We have listed major changes for each release below.
 `All downloads are available on GitHub <https://github.com/uccser/cs-field-guide/releases/>`__
 
+3.8.1
+==============================================================================
+
+**Release date:** 28th August 2021
+
+**Changelog:**
+
+- Fix encoding of JPG image that prevented minifying.
+- Modify workflow to only produce production docker image run on published release.
+
 3.8.0
 ==============================================================================