Merge branch 'commit-hash-develop' into 'develop'

Commit hash develop

See merge request funkwhale/funkwhale!524

.gitlab-ci.yml

@@ -240,6 +240,7 @@ docker_release:
     - cp -r front/dist api/frontend
     - cd api
   script:
+    - if [ "$CI_COMMIT_REF_NAME" == "develop" ]; then ./scripts/set-api-build-metadata $CI_COMMIT_SHORT_SHA; fi);
     - docker build -t $IMAGE .
     - docker push $IMAGE
   only:
@@ -257,6 +258,7 @@ build_api:
     paths:
       - api
   script:
+    - if [ "$CI_COMMIT_REF_NAME" == "develop" ]; then ./scripts/set-api-build-metadata $CI_COMMIT_SHORT_SHA; fi);
     - chmod -R 750 api
     - echo Done!
   only:

api/funkwhale_api/__init__.py

 # -*- coding: utf-8 -*-
-__version__ = "0.17"
+__version__ = "0.18-dev"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num

scripts/set-api-build-metadata.sh

+#!/bin/bash -eu
+# given a commit hash, will append this to the version number stored
+# in api/funkwhale_api/__init__.py
+
+commit=$1
+suffix="+git.$commit"
+replace="__version__ = \"\1${suffix}\""
+file="api/funkwhale_api/__init__.py"
+sed -i -E 's@__version__ = \"(.*)\"@'"$replace"'@' $file