Skip to content

Merge branch 'v2.2.x' into develop #640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pskrbasu merged 1 commit into from
Feb 27, 2026
Merged

Merge branch 'v2.2.x' into develop #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .claude/CLAUDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Release Process

## Files to update
1. **`version/version.go`**: Update `fdwVersion` to the new version (e.g., `"2.2.0"`).
2. **`CHANGELOG.md`**: Add a new entry at the top for the release version with the current date.

## Commit
- Commit message for release changes should always be the release version number (e.g., `v2.2.0`).

## Release PRs
When creating PRs for a release, always create two:
1. Against `develop`: title should be `Merge branch '<branchname>' into develop`
2. Against `main`: title should be `Release steampipe-postgres-fdw v<version>`

## Tagging and Build
1. Create a git tag matching the version (e.g., `v2.2.0`) on the release branch commit.
2. Push the tag to origin. This triggers the **Build Draft Release** workflow (`.github/workflows/buildimage.yml`).
3. The workflow builds the FDW shared library for all four platforms:
- Darwin x86_64 (`macos-15-intel`)
- Darwin ARM64 (`macos-latest`)
- Linux x86_64 (`ubuntu-22.04`)
- Linux ARM64 (`ubuntu-22.04-arm`)
4. On success, it creates a **draft release** on GitHub with all build artifacts.
5. Verify all build jobs pass before proceeding.

## Publishing the FDW Image
1. Trigger the **Publish FDW Image** workflow (`.github/workflows/publish.yml`) manually via `workflow_dispatch`.
- **Branch:** `develop`
- **Input `release`:** the version tag (e.g., `v2.2.0`)
2. This workflow downloads the draft release assets and pushes the FDW image to `ghcr.io/turbot/steampipe/fdw:<version>`.
3. Non-RC versions are also tagged as `latest`.

## Testing a workflow change without releasing
1. Push a temporary test tag (e.g., `v0.0.0-test-runner`) from the branch with the workflow change.
2. Verify all build jobs pass.
3. Clean up: delete the test tag (`git push origin --delete <tag>`) and the draft release (`gh release delete <tag> --yes`).
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
## v2.2.0 [2026-02-27]
_Whats new_
- Compiled with Go 1.26.
- Add support for propagation of OpenTelemetry context from clients. ([#568](https://github.com/turbot/steampipe-postgres-fdw/pull/568))
- Add support for propagation of OpenTelemetry context from clients with SQLcommenter. ([#569](https://github.com/turbot/steampipe-postgres-fdw/pull/569))
- Update Go version to 1.26. ([#637](https://github.com/turbot/steampipe-postgres-fdw/pull/637))

_Bug fixes_
- Fix OpenTelemetry metric names to only contain `[A-Za-z0-9_.-]`. ([#595](https://github.com/turbot/steampipe-postgres-fdw/pull/595))

_Dependencies_
- Bump `github.com/go-git/go-git/v5` from 5.16.2 to 5.16.5.
- Bump `github.com/go-git/go-git/v5` to remediate vulnerabilities.

## v2.1.5 [2026-02-06]
_Bug fixes_
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
)

// The main version number that is being run at the moment.
var fdwVersion = "2.1.4"
var fdwVersion = "2.2.0"

// A pre-release marker for the version. If this is "" (empty string)
// then it means that it is a final release. Otherwise, this is a pre-release
Expand Down
Loading