From bbf252485319e95747c34cb32bf6e576a628dd32 Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Mon, 9 Mar 2026 14:41:26 +0000 Subject: [PATCH 1/4] fix: add favicon --- public/favicon.ico | Bin 0 -> 32038 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/favicon.ico b/public/favicon.ico index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c260e860cf37905d4f1e06490a873b751aeaee86 100644 GIT binary patch literal 32038 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 literal 0 HcmV?d00001 From b730300fc73b96cdee0d000c5602884cb80cb58b Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Mon, 9 Mar 2026 16:25:29 +0000 Subject: [PATCH 2/4] fix: repair missing version number in builds --- .github/workflows/automated_release_and_build.yml | 10 ++++++---- compile-build | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/automated_release_and_build.yml b/.github/workflows/automated_release_and_build.yml index d2b5729f..06f9b198 100644 --- a/.github/workflows/automated_release_and_build.yml +++ b/.github/workflows/automated_release_and_build.yml @@ -15,8 +15,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - bundler-cache: true # Runs bundle install and caches gems. See the ruby_test.yml - # example if you need more control over bundler. + bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Export node version id: node_version run: echo ::set-output name=NODE_VERSION::$(cat .nvmrc) @@ -24,7 +23,10 @@ jobs: uses: actions/setup-node@v2 with: node-version: ${{ steps.node_version.outputs.NODE_VERSION }} + + # Create a release tag based on the branch name and .release-version file - name: Set release tag + # 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 @@ -34,8 +36,8 @@ jobs: cp config/database.yml.example config/database.yml cp config/bunny.yml.example config/bunny.yml - - name: Compile Build - run: ./compile-build + - name: Create Build + run: ./compile-build '' v${{ env.RELEASE_VERSION }} ${BRANCH_NAME} - name: Create release and upload release.tar.gz uses: ncipollo/release-action@v1.8.8 diff --git a/compile-build b/compile-build index cee51bf8..e26d52f7 100755 --- a/compile-build +++ b/compile-build @@ -10,9 +10,9 @@ bundle exec rake assets:clobber echo 'Compiling assets' bundle exec rake assets:precompile echo 'Generating sha' -git rev-parse HEAD > REVISION -git tag -l --points-at HEAD --sort -version:refname | head -1 > TAG -git rev-parse --abbrev-ref HEAD > BRANCH +echo ${1:-$(git rev-parse HEAD)} > REVISION +echo ${2:-$(git tag -l --points-at HEAD --sort -version:refname | head -1)} > TAG +echo ${3:-$(git rev-parse --abbrev-ref HEAD)} > BRANCH echo 'Compiling tar.gz' tar \ --exclude='*.swp' \ From 81dbe131195d83bea5a8678c944c1e0db844eda4 Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Mon, 9 Mar 2026 16:51:13 +0000 Subject: [PATCH 3/4] fix: repair missing version number in manual releases --- .github/workflows/asset_dispatch.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/asset_dispatch.yml b/.github/workflows/asset_dispatch.yml index a9834a21..3127f8b5 100644 --- a/.github/workflows/asset_dispatch.yml +++ b/.github/workflows/asset_dispatch.yml @@ -15,19 +15,26 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - uses: nelonoel/branch-name@v1.0.1 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - bundler-cache: true # Runs bundle install and caches gems. See the ruby_test.yml - # example if you need more control over bundler. + bundler-cache: true # runs 'bundle install' and caches installed gems automatically + + # Create a release tag based on the branch name and .release-version file + - name: Set release tag + # 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 - name: Set up environment run: | cp config/database.yml.example config/database.yml cp config/bunny.yml.example config/bunny.yml - - name: Compile Build - run: ./compile-build + - name: Create Build + run: ./compile-build '' v${{ env.RELEASE_VERSION }} ${BRANCH_NAME} - name: Create release uses: ncipollo/release-action@v1.8.8 From 8a0b7f99335681d1d41629ecc5931f00fc65143c Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Wed, 11 Mar 2026 11:05:46 +0000 Subject: [PATCH 4/4] fix: display correct version number --- app/views/about/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/about/show.html.erb b/app/views/about/show.html.erb index 9b2f3676..32365e76 100644 --- a/app/views/about/show.html.erb +++ b/app/views/about/show.html.erb @@ -1,6 +1,6 @@
-

Version 1.0

+

<%= Deployed::VERSION_STRING %>