updates

Author: ndonkoHenri

.github/scripts/common.sh

@@ -38,37 +38,32 @@ get_pyproject_version() {
 }
 
 compute_release_versions() {
-  local RUN_OFFSET="${RUN_OFFSET:-0}"
+  local OFFSET="${OFFSET:-0}"
   : "${GITHUB_RUN_NUMBER:=0}"
 
-  echo "compute_release_versions: start (GITHUB_RUN_NUMBER=${GITHUB_RUN_NUMBER}, RUN_OFFSET=${RUN_OFFSET})" >&2
-
   _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 "VERSION=$VERSION"
       echo "PKG_VER=$PKG_VER"
       echo "BUILD_VER=$BUILD_VER"
       echo "PYPI_VER=$PYPI_VER"
     } >> "$GITHUB_ENV"
 
-    # Write to GITHUB_OUTPUT and avoid noisy SIGPIPE if the consumer closes early
+    # Write to GITHUB_OUTPUT
     {
       echo "VERSION=$VERSION"
       echo "PKG_VER=$PKG_VER"
       echo "BUILD_VER=$BUILD_VER"
       echo "PYPI_VER=$PYPI_VER"
-    } | tee -a "$GITHUB_OUTPUT" >/dev/null || true
+    } | tee -a "$GITHUB_OUTPUT"
   }
 
   _next_dev_from() {
     # $1: base version (e.g., 1.2.3) → prints "PKG_VER BUILD_VER PYPI_VER" to STDOUT
     local base="$1" major minor
-    echo "compute_release_versions: _next_dev_from base=${base}" >&2
 
     major="${base%%.*}"
     minor="${base#*.}"; minor="${minor%%.*}"
@@ -78,48 +73,39 @@ compute_release_versions() {
     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
     printf '%s %s %s\n' "$pkg" "$build" "$pypi"
   }
 
   # ---------------- pyproject flow ----------------
   if [[ -n "${1-}" ]]; then
     local arg="$1" pyproject
-    echo "compute_release_versions: [pyproject] arg=${arg}" >&2
     if [[ "$arg" == */* || "$arg" == *.toml ]]; then
       pyproject="$arg"
     else
       pyproject="${SDK_PYTHON}/packages/${arg}/pyproject.toml"
     fi
-    echo "compute_release_versions: pyproject path=${pyproject}" >&2
 
     VERSION="$(uv run "$SCRIPTS/get_pyproject_version.py" "$pyproject")"
-    echo "compute_release_versions: got VERSION=${VERSION} from ${pyproject}" >&2
 
     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
     _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] (GITHUB_REF=${GITHUB_REF})" >&2
+    # get version from tag
     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}"
     _emit "$VERSION" "$PKG_VER" "$BUILD_VER" "$PYPI_VER"
     return
   fi
 
   # ---------------- untagged flow ----------------
   local cv
-  echo "compute_release_versions: [untagged] - resolving latest tag" >&2
   cv="$(git describe --abbrev=0 2>/dev/null || echo "v0.0.0")"
-  echo "compute_release_versions: latest tag resolved to ${cv}" >&2
 
   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
   _emit "$VERSION" "$PKG_VER" "$BUILD_VER" "$PYPI_VER"
 }

.github/scripts/update_build_version.sh

@@ -101,7 +101,7 @@ jobs:
         id: versions
         run: |
           source "$SCRIPTS/common.sh"
-          RUN_OFFSET=6000 compute_release_versions
+          OFFSET=6000 compute_release_versions
 
       - name: Setup Flutter
         uses: kuhnroyal/flutter-fvm-config-action/setup@v3

.github/workflows/ci.yml

@@ -20,9 +20,6 @@ env:
   SDK_PYTHON: "${{ github.workspace }}/sdk/python"
   SCRIPTS: "${{ github.workspace }}/.github/scripts"
   UV_PYTHON: "3.12"
-  #  PKG_VER: "0.2.0"
-  #  BUILD_VER: "0.2.0+${{ github.run_number }}"
-  #  PYPI_VER: "0.2.0.dev${{ github.run_number }}"
 
 jobs:
   build:
@@ -51,11 +48,10 @@ jobs:
           cache: true
 
       - name: Publish flet-ads
-        # if:
-        working-directory: ${{ env.SDK_PYTHON }}
+        # if: steps.changes.outputs.ads == 'true'
         run: |
           source "$SCRIPTS/common.sh"
-          RUN_OFFSET=500 compute_release_versions "flet-ads"
+          OFFSET=500 compute_release_versions "flet-ads"
 
           cd "${SDK_PYTHON}/packages/flet-ads/src/flutter/flet_ads"
           patch_pubspec_version "pubspec.yaml" "$PKG_VER"
@@ -72,8 +68,8 @@ jobs:
         with:
           name: dist
           path: |
-            $SDK_PYTHON/dist/*.whl
-            $SDK_PYTHON/dist/*.tar.gz
+            ${{ env.SDK_PYTHON }}/dist/*.whl
+            ${{ env.SDK_PYTHON }}/dist/*.tar.gz
 
 #      - name: Publish Python package
 #        if: >