Release 5.3.3

.github/workflows/docker-deploy.yml

@@ -3,27 +3,43 @@ on:
   push:
     branches:
       - master
-  release:
-      types: [published]
+    tags:
+      - "*"
+    paths-ignore:
+      - '**.md'
+      - '**.txt'
+      - 'contrib/**'
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Set deploy name to master
-        if: github.ref == 'refs/heads/master'
-        run: |
-          echo "DEPLOY_NAME=gollumwiki/gollum:master" >> $GITHUB_ENV
-      - name: Set deploy name to release version
-        if: startsWith(github.ref, 'refs/tags/')
-        run: |
-          echo "DEPLOY_NAME=gollumwiki/gollum:${{ github.ref_name }}" >> $GITHUB_ENV
       - name: Check Out Repo
         uses: actions/checkout@v2
-      - name: Login
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            gollumwiki/gollum
+            ghcr.io/gollum/gollum
+          tags: |
+            type=ref,event=branch,pattern=master
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
+      - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+      - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1
@@ -42,7 +58,8 @@ jobs:
           file: ./Dockerfile
           builder: ${{ steps.buildx.outputs.name }}
           push: true
-          tags: ${{ env.DEPLOY_NAME }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
           platforms: linux/amd64, linux/arm64

HISTORY.md

@@ -1,3 +1,7 @@
+# 5.3.3 / 2024-04-15
+
+* This release is to generate semantic versioning labels for Gollum's docker images. You can now e.g. `docker pull gollumwiki/gollum:5.3`.
+
 # 5.3.2 / 2023-05-01
 
 * Guard against [CVE-2020-11022](https://github.com/advisories/GHSA-gxr4-xjj5-5px2) (@bartkamphorst)

LATEST_CHANGES.md

@@ -1,3 +1,3 @@
-# 5.3.2
+# 5.3.3. / 2024-04-15
 
-* Guard against [CVE-2020-11022](https://github.com/advisories/GHSA-gxr4-xjj5-5px2) (@bartkamphorst)
+* This release is to generate semantic versioning labels for Gollum's docker images. You can now e.g. `docker pull gollumwiki/gollum:5.3`.

Rakefile

@@ -115,15 +115,14 @@ end
 
 desc 'Create a release build and push to rubygems'
 task :release => :build do
-  unless `git branch` =~ /^\* master$/
+  unless `git branch` =~ /^\* 5.3.3semver$/
     puts "You must be on the master branch to release!"
     exit!
   end
   Rake::Task[:changelog].execute
   sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git pull --rebase origin master"
+  #sh "git pull --rebase origin master"
   sh "git tag v#{version}"
-  sh "git push origin master"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
 end
@@ -185,7 +184,7 @@ end
 desc 'Build changlog'
 task :changelog do
   [latest_changes_file, history_file].each do |f|
-    unless File.exists?(f)
+    unless File.exist?(f)
       puts "#{f} does not exist but is required to build a new release."
       exit!
     end

gollum.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.6'
 
   s.name              = 'gollum'
-  s.version           = '5.3.2'
+  s.version           = '5.3.3'
   s.license           = 'MIT'
 
   s.summary     = 'A simple, Git-powered wiki.'
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack-test', '~> 0.6.3'
   s.add_development_dependency 'shoulda', '~> 3.6.0'
   s.add_development_dependency 'minitest-reporters', '~> 1.3.6'
-  s.add_development_dependency 'mocha', '~> 1.8.0'
+  s.add_development_dependency 'mocha', '~> 2.0'
   s.add_development_dependency 'test-unit', '~> 3.3.0'
 
   # = MANIFEST =

lib/gollum.rb

@@ -13,7 +13,7 @@
 require ::File.expand_path('../gollum/uri_encode_component', __FILE__)
 
 module Gollum
-  VERSION = '5.3.2'
+  VERSION = '5.3.3'
 
   ::I18n.available_locales = [:en]
   ::I18n.load_path = Dir[::File.expand_path("lib/gollum/locales") + "/*.yml"]

test/helper.rb

@@ -4,7 +4,7 @@
 require 'minitest/autorun'
 require 'minitest/reporters'
 require 'minitest/spec'
-require 'mocha/setup'
+require 'mocha/minitest'
 require 'fileutils'
 require 'tmpdir'