Merge pull request #41 from cryptosense/fix-release-3

Fix release (again)

Author: bertrand-sb

.github/workflows/main.yml

@@ -12,9 +12,6 @@ jobs:
     steps:
       - name: Checkout the code
         uses: actions/checkout@v4
-      - name: Fetch tags
-        if: startsWith(github.ref, 'refs/tags/')  # https://github.com/actions/checkout/issues/1467
-        run: git fetch --tags
       - name: Set up OCaml
         # We can't use setup-ocaml@v3 yet because ocurl can't be installed with it for now
         # (curl-config issue).
@@ -24,16 +21,17 @@ jobs:
           opam-repositories: |
             opam-repository-mingw: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset
             default: https://github.com/ocaml/opam-repository.git
-      - name: Pin the dependencies
-        run: opam pin add cs_api_client.dev --no-action .
-      - name: Install the dependencies
-        run: opam install --deps-only --with-test .
       - name: Set build version
         id: build_version
-        run: echo "value=$(git describe --always HEAD)" >> $env:GITHUB_OUTPUT
+        run: |
+          echo "value=$(bash ci/get_version.bash "${{ github.ref_type }}" "${{ github.ref_name }}")" >> $env:GITHUB_OUTPUT
       - name: Using version ${{ steps.build_version.outputs.value }}
         run: |
           echo "Version number: ${{ steps.build_version.outputs.value }}"
+      - name: Pin the dependencies
+        run: opam pin add cs_api_client.dev --no-action .
+      - name: Install the dependencies
+        run: opam install --deps-only --with-test .
       - name: Insert the version number
         run: ./ci/subst.bash "${{ steps.build_version.outputs.value }}"
         if: startsWith(github.ref, 'refs/tags/')
@@ -54,14 +52,12 @@ jobs:
     steps:
       - name: Checkout the code
         uses: actions/checkout@v4
-      - name: Fetch tags
-        if: startsWith(github.ref, 'refs/tags/')  # https://github.com/actions/checkout/issues/1467
-        run: git fetch --tags
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Set build version
         id: build_version
-        run: echo "value=$(git describe --always HEAD)" >> $GITHUB_OUTPUT
+        run: |
+          echo "value=$(./ci/get_version.bash "${{ github.ref_type }}" "${{ github.ref_name }}")" >> $GITHUB_OUTPUT
       - name: Using version ${{ steps.build_version.outputs.value }}
         run: |
           echo "Version number: ${{ steps.build_version.outputs.value }}"

ci/get_version.bash

@@ -0,0 +1,25 @@
+#!/bin/bash
+set -o errexit
+set -o nounset
+set -o pipefail
+
+# Generate a version string for use in version substitution in CI.
+#
+# The first argument should be `github.ref_type` (e.g. `tag` or `branch`). The second
+# argument should be `github.ref_name` (e.g. `1.2.3`).
+
+main() {
+    local ref_type=$1; shift
+    local ref_name=$1; shift
+
+    if [ "$ref_type" = "tag" ]; then
+        echo "$ref_name"
+    elif [ "$ref_type" = "branch" ]; then
+        echo "dev-$(git describe --always HEAD)"
+    else
+        echo "Unexpected ref_type: $ref_type" >&2
+        exit 1
+    fi
+}
+
+main "$@"