diff --git a/.github/workflows/build-releases.yml b/.github/workflows/build-releases.yml index b74c1705..8552087a 100644 --- a/.github/workflows/build-releases.yml +++ b/.github/workflows/build-releases.yml @@ -494,47 +494,12 @@ jobs: EOF fi - - name: Update version info and commit release + - name: Commit generated files to release branch if: success() && github.event.inputs.dry_run == 'false' run: | GDAL_VERSION="${{ steps.validate.outputs.gdal_version }}" - BUILD_DATE="$(date -I)" - GENERATED_AT="$(date '+%Y-%m-%d %H:%M:%S')" - # Parse version components - MAJOR=$(echo "$GDAL_VERSION" | cut -d. -f1) - MINOR=$(echo "$GDAL_VERSION" | cut -d. -f2) - PATCH=$(echo "$GDAL_VERSION" | cut -d. -f3) - - # Get R and package versions from the Docker image - IMAGE="ghcr.io/${{ github.repository }}:gdal-${GDAL_VERSION}-latest" - R_VERSION=$(docker run --rm "$IMAGE" R --version 2>/dev/null | head -1 | sed 's/R version \([0-9.]*\).*/\1/') - PROCESSX_VERSION=$(docker run --rm "$IMAGE" Rscript --slave -e "cat(as.character(packageVersion('processx')))" 2>/dev/null || echo "unknown") - YYJSONR_VERSION=$(docker run --rm "$IMAGE" Rscript --slave -e "cat(as.character(packageVersion('yyjsonr')))" 2>/dev/null || echo "unknown") - - # Ensure inst/ directory exists - mkdir -p inst - - cat > inst/GDAL_VERSION_INFO.json </dev/null || true @@ -555,7 +520,6 @@ jobs: if ! git diff --cached --quiet; then git commit -m "Release: gdalcli for GDAL $GDAL_VERSION" - # Force push is safe here because we've reset branch to main and applied generated files git push origin ${{ steps.validate.outputs.branch_name }} --force else echo "No changes to commit"