Skip to content

Commit 1c8720e

Browse files
authored
Merge branch 'v2.2.x' into develop
2 parents 38fbc69 + 217346c commit 1c8720e

3 files changed

Lines changed: 39 additions & 3 deletions

File tree

.claude/CLAUDE.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Release Process
2+
3+
## Files to update
4+
1. **`version/version.go`**: Update `fdwVersion` to the new version (e.g., `"2.2.0"`).
5+
2. **`CHANGELOG.md`**: Add a new entry at the top for the release version with the current date.
6+
7+
## Commit
8+
- Commit message for release changes should always be the release version number (e.g., `v2.2.0`).
9+
10+
## Release PRs
11+
When creating PRs for a release, always create two:
12+
1. Against `develop`: title should be `Merge branch '<branchname>' into develop`
13+
2. Against `main`: title should be `Release steampipe-postgres-fdw v<version>`
14+
15+
## Tagging and Build
16+
1. Create a git tag matching the version (e.g., `v2.2.0`) on the release branch commit.
17+
2. Push the tag to origin. This triggers the **Build Draft Release** workflow (`.github/workflows/buildimage.yml`).
18+
3. The workflow builds the FDW shared library for all four platforms:
19+
- Darwin x86_64 (`macos-15-intel`)
20+
- Darwin ARM64 (`macos-latest`)
21+
- Linux x86_64 (`ubuntu-22.04`)
22+
- Linux ARM64 (`ubuntu-22.04-arm`)
23+
4. On success, it creates a **draft release** on GitHub with all build artifacts.
24+
5. Verify all build jobs pass before proceeding.
25+
26+
## Publishing the FDW Image
27+
1. Trigger the **Publish FDW Image** workflow (`.github/workflows/publish.yml`) manually via `workflow_dispatch`.
28+
- **Branch:** `develop`
29+
- **Input `release`:** the version tag (e.g., `v2.2.0`)
30+
2. This workflow downloads the draft release assets and pushes the FDW image to `ghcr.io/turbot/steampipe/fdw:<version>`.
31+
3. Non-RC versions are also tagged as `latest`.
32+
33+
## Testing a workflow change without releasing
34+
1. Push a temporary test tag (e.g., `v0.0.0-test-runner`) from the branch with the workflow change.
35+
2. Verify all build jobs pass.
36+
3. Clean up: delete the test tag (`git push origin --delete <tag>`) and the draft release (`gh release delete <tag> --yes`).

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
## v2.2.0 [2026-02-27]
22
_Whats new_
3+
- Compiled with Go 1.26.
34
- Add support for propagation of OpenTelemetry context from clients. ([#568](https://github.com/turbot/steampipe-postgres-fdw/pull/568))
45
- Add support for propagation of OpenTelemetry context from clients with SQLcommenter. ([#569](https://github.com/turbot/steampipe-postgres-fdw/pull/569))
5-
- Update Go version to 1.26. ([#637](https://github.com/turbot/steampipe-postgres-fdw/pull/637))
66

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

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

1313
## v2.1.5 [2026-02-06]
1414
_Bug fixes_

version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
)
1212

1313
// The main version number that is being run at the moment.
14-
var fdwVersion = "2.1.4"
14+
var fdwVersion = "2.2.0"
1515

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

0 commit comments

Comments
 (0)