From fe1e8f2379b136f6f4d15dfc29e3e1f569334ccd Mon Sep 17 00:00:00 2001 From: Katy Taylor Date: Mon, 7 Mar 2022 12:00:49 +0000 Subject: [PATCH 1/6] update github build script to unify the naming of github releases, github tags and docker images, to make deployments less confusing --- .github/workflows/automated_release_and_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automated_release_and_build.yml b/.github/workflows/automated_release_and_build.yml index ee42dbf..631493d 100644 --- a/.github/workflows/automated_release_and_build.yml +++ b/.github/workflows/automated_release_and_build.yml @@ -56,7 +56,7 @@ jobs: uses: ncipollo/release-action@v1.8.8 with: name: ${{ env.RELEASE_VERSION }} - tag: v${{ env.RELEASE_VERSION }} + tag: ${{ env.RELEASE_VERSION }} prerelease: ${{ !(github.ref == 'refs/heads/master') }} commit: ${{ github.sha }} From f493f22b07a9e6d37d3ddd3d2ee358f613154924 Mon Sep 17 00:00:00 2001 From: Katy Taylor Date: Mon, 7 Mar 2022 12:06:06 +0000 Subject: [PATCH 2/6] missed this --- .github/workflows/check_release_version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_release_version.yml b/.github/workflows/check_release_version.yml index 4c8aeac..c11147b 100644 --- a/.github/workflows/check_release_version.yml +++ b/.github/workflows/check_release_version.yml @@ -22,6 +22,6 @@ jobs: - name: Compare releases run: >- - if [ "${{ steps.last_release.outputs.release }}" = "$(printf 'v%s\n' $(cat .release-version))" ]; then + if [ "${{ steps.last_release.outputs.release }}" = "$(printf '%s\n' $(cat .release-version))" ]; then exit 1; fi From b036c31978eb52f1ad75ef2814efbbb00e143ad5 Mon Sep 17 00:00:00 2001 From: Stuart McHattie Date: Fri, 4 Nov 2022 15:53:38 +0000 Subject: [PATCH 3/6] Change default local port number --- .flaskenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.flaskenv b/.flaskenv index 29720a7..2789908 100644 --- a/.flaskenv +++ b/.flaskenv @@ -6,7 +6,7 @@ FLASK_APP=baracoda # https://flask.palletsprojects.com/en/1.1.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/1.1.x/config/#environment-and-debug-features FLASK_ENV=development From 6ff002a29f4f3c7273d5394acfc43e4152623c60 Mon Sep 17 00:00:00 2001 From: Stuart McHattie Date: Fri, 4 Nov 2022 16:01:03 +0000 Subject: [PATCH 4/6] Ensure all release tags start with a v --- .../workflows/automated_release_and_build.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/automated_release_and_build.yml b/.github/workflows/automated_release_and_build.yml index 1d86124..d1eeedc 100644 --- a/.github/workflows/automated_release_and_build.yml +++ b/.github/workflows/automated_release_and_build.yml @@ -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/release-action@v1.8.8 with: - name: ${{ env.RELEASE_VERSION }} - tag: ${{ 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 From 8a7f0ee2ffaacab86935232f6aec70ae35da541b Mon Sep 17 00:00:00 2001 From: Andrew Sparkes Date: Thu, 24 Nov 2022 17:24:02 +0000 Subject: [PATCH 5/6] github workflows update ubuntu --- .github/workflows/automated_release_and_build.yml | 2 +- .github/workflows/ci.yml | 8 ++++---- .github/workflows/docker_dispatch.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/automated_release_and_build.yml b/.github/workflows/automated_release_and_build.yml index d1eeedc..04f8fe5 100644 --- a/.github/workflows/automated_release_and_build.yml +++ b/.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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99b6185..e3f9625 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/.github/workflows/docker_dispatch.yml b/.github/workflows/docker_dispatch.yml index 4d2f9c5..76ec723 100644 --- a/.github/workflows/docker_dispatch.yml +++ b/.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 From 209d0391fad7f28f8de764a812c12f1a5a857d4c Mon Sep 17 00:00:00 2001 From: Andrew Sparkes Date: Mon, 28 Nov 2022 11:11:16 +0000 Subject: [PATCH 6/6] Incremented version number --- .release-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.release-version b/.release-version index dbe5900..c8e38b6 100644 --- a/.release-version +++ b/.release-version @@ -1 +1 @@ -2.8.1 +2.9.0