Merge branch 'main' into dboreham/new-build-version-scheme

.gitea/workflows/publish.yml

@@ -13,6 +13,16 @@ jobs:
     steps:
       - name: "Clone project repository"
         uses: actions/checkout@v3
+      - name: "Get build info" # TODO: put this in a library
+        id: build-info
+        run: |
+          build_time=$(date +'%Y%m%d%H%M')
+          product_version=$( cat app/data/version.txt )
+          short_sha=$(git rev-parse --short HEAD)
+          build_tag=$(echo "v${product_version}-${short_sha}-${build_time}")
+          echo "build-time=${build_time}" >> $GITHUB_OUTPUT
+          echo "short-sha=${short_sha}" >> $GITHUB_OUTPUT
+          echo "build-tag=${build_tag}" >> $GITHUB_OUTPUT
       - name: "Install Python"
         uses: cerc-io/setup-python@v4
         with:
@@ -21,14 +31,6 @@ jobs:
         run: python3 --version
       - name: "Install shiv"
         run: pip install shiv
-      - name: "Create release"
-        uses: cerc-io/action-gh-release@gitea-v1
-        # We haven't decided how to trigger this release job.
-        # It might be done on creation of a git tag
-        # Or it might be done on merge to a release branch
-        # Somehow by this point however we need to know the release version
-        with:
-          tag_name: "v1.2.5"
       - name: "Build local shiv package"
         id: build
         # Build has to be done after deciding on the version because
@@ -36,13 +38,13 @@ jobs:
         run: |
           ./scripts/build_shiv_package.sh
           result_code=$?
-          echo "::set-output name=package-file::$(ls ./package/*)"
+          echo "package-file=$(ls ./package/*)" >> $GITHUB_OUTPUT
           exit $result_code          
       - name: "Stage artifact file"
         run: |
                     cp ${{ steps.build.outputs.package-file }} ./laconic-so
-      - name: "Upload release artifact"
+      - name: "Create release"
         uses: cerc-io/action-gh-release@gitea-v1
         with:
-          tag_name: "v1.2.5"
+          tag_name: "${{ steps.build-info.outputs.build-tag }}"
           files: ./laconic-so