Merge pull request #317 from sanger/develop

develop to master

.flaskenv

@@ -6,7 +6,7 @@ FLASK_APP=baracoda
 
 # https://flask.palletsprojects.com/en/2.2.x/cli/#setting-command-options
 FLASK_RUN_HOST=0.0.0.0
-FLASK_RUN_PORT=8000
+FLASK_RUN_PORT=7900
 
 # https://flask.palletsprojects.com/en/2.2.x/config/#DEBUG
 FLASK_DEBUG=true

.github/workflows/automated_release_and_build.yml

@@ -11,7 +11,7 @@ env:
 
 jobs:
   build_test_release_push:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     services:
       postgres:
         image: postgres
@@ -46,17 +46,20 @@ jobs:
           docker.pkg.github.com/${IMAGE_NAME}:${BRANCH_NAME}
           python -m pytest --no-cov -vx
 
-      - name: Set release tag
+      - name: Set release name
         # https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
-        # On the develop branch this might create RELEASE_VERSION=2.4.6-987654321-develop
-        # On the master branch this would then only create RELEASE_VERSION=2.4.6
-        run: echo "RELEASE_VERSION=$(printf -- '%s%s\n' $(cat .release-version) $([ ${BRANCH_NAME} = "develop" ] && printf -- '-%s-develop' ${GITHUB_RUN_ID} || echo ""))" >> $GITHUB_ENV
+        # On the develop branch this might create RELEASE_NAME=2.4.6-987654321-develop
+        # On the master branch this would then only create RELEASE_NAME=2.4.6
+        run: echo "RELEASE_NAME=$(printf -- '%s%s\n' $(cat .release-version) $([ ${BRANCH_NAME} = "develop" ] && printf -- '-%s-develop' ${GITHUB_RUN_ID} || echo ""))" >> $GITHUB_ENV
+
+      - name: Set release tag
+        run: echo "RELEASE_TAG=v$RELEASE_NAME" >> $GITHUB_ENV
 
       - name: Create release
         uses: ncipollo/[email protected]
         with:
-          name: ${{ env.RELEASE_VERSION }}
-          tag: v${{ env.RELEASE_VERSION }}
+          name: ${{ env.RELEASE_NAME }}
+          tag: ${{ env.RELEASE_TAG }}
           prerelease: ${{ !(github.ref == 'refs/heads/master') }}
           commit: ${{ github.sha }}
 
@@ -71,11 +74,11 @@ jobs:
         run: >-
           docker tag
           docker.pkg.github.com/${IMAGE_NAME}:${BRANCH_NAME}
-          docker.pkg.github.com/${IMAGE_NAME}:${{ env.RELEASE_VERSION }}
+          docker.pkg.github.com/${IMAGE_NAME}:${{ env.RELEASE_TAG }}
 
       - name: Push release tag image to registry
         run: >-
-          docker push docker.pkg.github.com/${IMAGE_NAME}:${{ env.RELEASE_VERSION }}
+          docker push docker.pkg.github.com/${IMAGE_NAME}:${{ env.RELEASE_TAG }}
 
       - name: Remove the oldest package
         if: false

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   black:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
@@ -36,7 +36,7 @@ jobs:
           # stop the build if there are black formatting errors
           python -m black --check .
   flake8:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
@@ -60,7 +60,7 @@ jobs:
           # stop the build if there are Python syntax errors or undefined names
           flake8
   mypy:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
@@ -83,7 +83,7 @@ jobs:
         run: |
           python -m mypy .
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     services:
       postgres:
         image: postgres:9.6

.github/workflows/docker_dispatch.yml

@@ -13,7 +13,7 @@ env:
 
 jobs:
   build_and_publish:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
 

.release-version

@@ -1 +1 @@
-2.8.1
+2.9.0