updates

Author: ndonkoHenri

.github/scripts/common.sh

@@ -41,17 +41,15 @@ compute_release_versions() {
   local RUN_OFFSET="${RUN_OFFSET:-0}"
   : "${GITHUB_RUN_NUMBER:=0}"
 
-  # Basic debug output to help trace failures
-  echo "compute_release_versions: start (GITHUB_RUN_NUMBER=${GITHUB_RUN_NUMBER}, RUN_OFFSET=${RUN_OFFSET})" >&2
-  #trap 'rc=$?; echo "compute_release_versions: ERROR at line $LINENO rc=$rc cmd=\"${BASH_COMMAND}\"" >&2' ERR
+  echo "compute_release_versions: start (GITHUB_RUN_NUMBER=${GITHUB_RUN_NUMBER}, RUN_OFFSET=${RUN_OFFSET})"
 
   local VERSION PKG_VER BUILD_VER PYPI_VER
 
   _emit() {
     # $1..$4: VERSION PKG_VER BUILD_VER PYPI_VER
     export VERSION="$1" PKG_VER="$2" BUILD_VER="$3" PYPI_VER="$4"
 
-    echo "compute_release_versions: _emit -> VERSION=$VERSION PKG_VER=$PKG_VER BUILD_VER=$BUILD_VER PYPI_VER=$PYPI_VER" >&2
+    echo "compute_release_versions: _emit -> VERSION=$VERSION PKG_VER=$PKG_VER BUILD_VER=$BUILD_VER PYPI_VER=$PYPI_VER"
 
     {
       echo "VERSION=$VERSION"
@@ -70,57 +68,57 @@ compute_release_versions() {
 
   _next_dev_from() {
     # $1: base version (e.g., 1.2.3) → outputs "PKG_VER BUILD_VER PYPI_VER"
-    local base="$1"
-    echo "compute_release_versions: _next_dev_from base=${base}" >&2
-    local major minor
+    local base="$1" major minor
+    echo "compute_release_versions: _next_dev_from base=${base}"
+    # Extract the major version (before the first dot)
     major="${base%%.*}"
+    # Extract the minor version (between the first and second dot)
     minor="${base#*.}"; minor="${minor%%.*}"
     minor=$((minor + 1))
+
     local pkg="${major}.${minor}.0"
     local build="${pkg}+$((GITHUB_RUN_NUMBER + RUN_OFFSET))"
     local pypi="${build/+/.dev}"
-    echo "compute_release_versions: _next_dev_from -> pkg=${pkg} build=${build} pypi=${pypi}" >&2
+    echo "compute_release_versions: _next_dev_from -> pkg=${pkg} build=${build} pypi=${pypi}"
     printf '%s %s %s\n' "$pkg" "$build" "$pypi"
   }
 
   # ---------------- pyproject flow ----------------
   if [[ -n "${1-}" ]]; then
     local arg="$1" pyproject
-    echo "compute_release_versions: pyproject flow arg=${arg}" >&2
+    echo "compute_release_versions: [pyproject] arg=${arg}"
     if [[ "$arg" == */* || "$arg" == *.toml ]]; then
       pyproject="$arg"
     else
       pyproject="${SDK_PYTHON}/packages/${arg}/pyproject.toml"
     fi
-    echo "compute_release_versions: pyproject path=${pyproject}" >&2
+    echo "compute_release_versions: pyproject path=${pyproject}"
 
     VERSION="$(uv run "$SCRIPTS/get_pyproject_version.py" "$pyproject")"
-    echo "compute_release_versions: got VERSION=${VERSION} from ${pyproject}" >&2
+    echo "compute_release_versions: got VERSION=${VERSION} from ${pyproject}"
     read -r PKG_VER BUILD_VER PYPI_VER < <(_next_dev_from "$VERSION")
-    echo "compute_release_versions: computed PKG_VER=${PKG_VER} BUILD_VER=${BUILD_VER} PYPI_VER=${PYPI_VER}" >&2
+    echo "compute_release_versions: computed PKG_VER=${PKG_VER} BUILD_VER=${BUILD_VER} PYPI_VER=${PYPI_VER}"
     _emit "$VERSION" "$PKG_VER" "$BUILD_VER" "$PYPI_VER"
     return
   fi
 
   # ---------------- git/tag flow ----------------
   if [[ "${GITHUB_REF:-}" == refs/tags/* ]]; then
-    echo "compute_release_versions: git/tag flow (GITHUB_REF=${GITHUB_REF})" >&2
+    echo "compute_release_versions: [git/tag] (GITHUB_REF=${GITHUB_REF})"
     VERSION="${GITHUB_REF#refs/tags/}"; VERSION="${VERSION#v}"
-    echo "compute_release_versions: tag VERSION=${VERSION}" >&2
-    PKG_VER="$VERSION"
-    BUILD_VER="$PKG_VER"
-    PYPI_VER="${BUILD_VER/+/.dev}"
+    echo "compute_release_versions: tag VERSION=${VERSION}"
+    PKG_VER="$VERSION"; BUILD_VER="$PKG_VER"; PYPI_VER="${BUILD_VER/+/.dev}"
     _emit "$VERSION" "$PKG_VER" "$BUILD_VER" "$PYPI_VER"
     return
   fi
 
   # Untagged: base = latest tag (or 0.0.0), then next-dev
   local cv
-  echo "compute_release_versions: untagged flow - resolving latest tag" >&2
+  echo "compute_release_versions: [untagged] - resolving latest tag"
   cv="$(git describe --abbrev=0 2>/dev/null || echo "v0.0.0")"
-  echo "compute_release_versions: latest tag resolved to ${cv}" >&2
+  echo "compute_release_versions: latest tag resolved to ${cv}"
   VERSION="${cv#v}"
   read -r PKG_VER BUILD_VER PYPI_VER < <(_next_dev_from "$VERSION")
-  echo "compute_release_versions: final computed PKG_VER=${PKG_VER} BUILD_VER=${BUILD_VER} PYPI_VER=${PYPI_VER}" >&2
+  echo "compute_release_versions: final computed PKG_VER=${PKG_VER} BUILD_VER=${BUILD_VER} PYPI_VER=${PYPI_VER}"
   _emit "$VERSION" "$PKG_VER" "$BUILD_VER" "$PYPI_VER"
 }

.github/workflows/extensions.yml

@@ -52,16 +52,15 @@ jobs:
 
       - name: Publish flet-ads
         # if:
-        working-directory: ${{ env.SDK_PYTHON }}/packages
+        working-directory: ${{ env.SDK_PYTHON }}
         run: |
           source "$SCRIPTS/common.sh"
           RUN_OFFSET=500 compute_release_versions "flet-ads"
 
-          pushd "src/flutter/flet_ads"
-          patch_pubspec_version "pubspec.yaml" "$PKG_VER"
+          pushd "${SDK_PYTHON}/packages/flet-ads"
+          patch_pubspec_version "src/flutter/flet_ads/pubspec.yaml" "$PKG_VER"
           dart pub get && dart analyze
 
-          popd
           uv version "$PYPI_VER"
           uv build
           ls -laR "${SDK_PYTHON}/dist"