Skip to content

Commit ef2a62f

Browse files
committed
Align version of OSS and enterprise version.
- Bumps OSS version to 0.90 to align with next enterprise release. - From now on feldera/feldera release is triggered from enterprise repo - Makes sure enterprise release and OSS release use the same sha for feldera/feldera for a given version (from 0.90 onwards). Signed-off-by: Gerd Zellweger <mail@gerdzellweger.com>
1 parent c706c56 commit ef2a62f

File tree

9 files changed

+45
-57
lines changed

9 files changed

+45
-57
lines changed

.github/workflows/ci-post-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ jobs:
2525
options: --user=ubuntu
2626
volumes:
2727
- /sccache:/sccache
28-
needs: [publish-crates, publish-python]
2928
steps:
3029
- uses: actions/checkout@v4
3130
with:
@@ -51,7 +50,8 @@ jobs:
5150
- name: List changes
5251
run: |
5352
git diff
54-
- uses: EndBug/add-and-commit@v9
53+
- uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5
54+
if: ${{ vars.RELEASE_DRY_RUN == 'false' }}
5555
with:
5656
message: "ci: Prepare for v${{ env.NEXT_VERSION }}"
5757
push: origin main

.github/workflows/ci-release.yml

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
name: Create a new release
22

33
on:
4-
workflow_dispatch:
5-
inputs:
6-
sha:
7-
description: "SHA to release (a recent commit from main that hasn't been released yet)"
8-
schedule:
9-
- cron: "11 7 * * *" # Runs at 07:11 UTC daily
4+
repository_dispatch:
5+
types: [trigger-oss-release]
106

117
env:
128
REGISTRY: ghcr.io
@@ -15,11 +11,16 @@ jobs:
1511
release:
1612
runs-on: ubuntu-latest
1713
steps:
18-
- name: Set SHA_TO_RELEASE
14+
- name: Set SHA_TO_RELEASE and CURRENT_VERSION
1915
run: |
20-
echo "SHA_TO_RELEASE=${{ github.event.inputs.sha || '' }}" >> $GITHUB_ENV
21-
if [ -z "${{ github.event.inputs.sha }}" ]; then
22-
echo "SHA_TO_RELEASE=${{ github.sha }}" >> $GITHUB_ENV
16+
echo "CURRENT_VERSION=${{ github.event.client_payload.version }}" >> $GITHUB_ENV
17+
echo "SHA_TO_RELEASE=${{ github.event.client_payload.sha_to_release }}" >> $GITHUB_ENV
18+
19+
- name: Check SHA and version inputs
20+
run: |
21+
if [ -z "${SHA_TO_RELEASE}" ] || [ -z "${CURRENT_VERSION}" ]; then
22+
echo "Missing required release parameters"
23+
exit 1
2324
fi
2425
2526
- name: Checkout
@@ -28,24 +29,9 @@ jobs:
2829
fetch-tags: true
2930
ref: ${{ env.SHA_TO_RELEASE }}
3031

31-
- name: Determine version to release based on pipeline-manager
32-
run: |
33-
echo "CURRENT_VERSION=$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[]|select(.name == "pipeline-manager")|.version')" >> $GITHUB_ENV
34-
35-
- name: Check if version is already released (do we have git tag for this version?)
36-
run: |
37-
if git tag -l | grep -q "^v${{ env.CURRENT_VERSION }}$"; then
38-
echo "Version ${CURRENT_VERSION} is already released"
39-
echo "version_exists=true" >> $GITHUB_ENV
40-
else
41-
echo "Version ${CURRENT_VERSION} is not released yet"
42-
echo "version_exists=false" >> $GITHUB_ENV
43-
fi
44-
4532
- name: Download artifact
46-
if: env.version_exists == 'false'
4733
id: download-artifact
48-
uses: dawidd6/action-download-artifact@v9
34+
uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5
4935
with:
5036
workflow: ci.yml
5137
workflow_conclusion: success
@@ -56,18 +42,17 @@ jobs:
5642
if_no_artifact_found: fail
5743

5844
- name: Attach version to binaries
59-
if: env.version_exists == 'false'
6045
run: |
6146
mv feldera-binaries-aarch64-unknown-linux-gnu.zip feldera-binaries-v${{ env.CURRENT_VERSION }}-aarch64-unknown-linux-gnu.zip
6247
mv feldera-binaries-x86_64-unknown-linux-gnu.zip feldera-binaries-v${{ env.CURRENT_VERSION }}-x86_64-unknown-linux-gnu.zip
6348
mv feldera-sql-compiler.zip feldera-sql-compiler-v${{ env.CURRENT_VERSION }}.zip
6449
mv feldera-docs.zip feldera-docs-v${{ env.CURRENT_VERSION }}.zip
6550
6651
- name: Release on GitHub
67-
if: env.version_exists == 'false'
68-
uses: softprops/action-gh-release@v2
52+
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8
6953
with:
7054
tag_name: v${{ env.CURRENT_VERSION }}
55+
draft: ${{ vars.RELEASE_DRY_RUN }}
7156
generate_release_notes: true
7257
make_latest: true
7358
files: |
@@ -83,6 +68,7 @@ jobs:
8368
run: unzip feldera-docs-v${{ env.CURRENT_VERSION }}.zip -d docs
8469

8570
- name: Deploy docs.feldera.com
71+
if: ${{ vars.RELEASE_DRY_RUN == 'false' }}
8672
uses: JamesIves/github-pages-deploy-action@v4
8773
with:
8874
folder: docs
@@ -107,6 +93,7 @@ jobs:
10793
version: latest
10894

10995
- name: Tag docker image with version and latest
96+
if: ${{ vars.RELEASE_DRY_RUN == 'false' }}
11097
run: |
11198
docker buildx imagetools create -t ${{ vars.FELDERA_IMAGE_NAME }}:${{ env.CURRENT_VERSION }} ${{ vars.FELDERA_IMAGE_NAME }}:sha-${{ env.SHA_TO_RELEASE }}
11299
docker buildx imagetools create -t ${{ vars.FELDERA_IMAGE_NAME }}:latest ${{ vars.FELDERA_IMAGE_NAME }}:sha-${{ env.SHA_TO_RELEASE }}

.github/workflows/publish-crates.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
- uses: actions/checkout@v4
2020

2121
- name: Run cargo publish
22+
if: ${{ vars.RELEASE_DRY_RUN == 'false' }}
2223
run: |
2324
cargo publish ${{ vars.CARGO_PUBLISH_FLAGS }} --package feldera-types
2425
cargo publish ${{ vars.CARGO_PUBLISH_FLAGS }} --package feldera-storage

.github/workflows/publish-python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
run: |
3535
uv build
3636
- name: Publish package
37-
if: github.repository == 'feldera/feldera'
37+
if: ${{ vars.RELEASE_DRY_RUN == 'false' }}
3838
uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
3939
with:
4040
packages_dir: ./python/dist

Cargo.lock

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[workspace.package]
22
authors = ["Feldera Team <dev@feldera.com>"]
3-
version = "0.70.0"
3+
version = "0.90.0"
44
license = "MIT OR Apache-2.0"
55
homepage = "https://github.com/feldera/feldera"
66
repository = "https://github.com/feldera/feldera"
@@ -86,7 +86,7 @@ crossbeam-utils = "0.8.6"
8686
csv = "1.2.2"
8787
csv-core = "0.1.10"
8888
datafusion = "47"
89-
dbsp = { path = "crates/dbsp", version = "0.70.0" }
89+
dbsp = { path = "crates/dbsp", version = "0.90.0" }
9090
dbsp_nexmark = { path = "crates/nexmark" }
9191
deadpool-postgres = "0.10.5"
9292
dec = { version = "0.4.9", features = ["serde"] }
@@ -105,10 +105,10 @@ feldera-adapterlib = { path = "crates/adapterlib" }
105105
feldera-datagen = { path = "crates/datagen" }
106106
feldera-iceberg = { path = "crates/iceberg" }
107107
feldera-sqllib = { path = "crates/sqllib" }
108-
feldera-storage = { version = "0.70.0", path = "crates/storage" }
109-
feldera-types = { version = "0.70.0", path = "crates/feldera-types" }
110-
feldera-rest-api = { version = "0.70.0", path = "crates/rest-api" }
111-
feldera-ir = { version = "0.70.0", path = "crates/ir" }
108+
feldera-storage = { version = "0.90.0", path = "crates/storage" }
109+
feldera-types = { version = "0.90.0", path = "crates/feldera-types" }
110+
feldera-rest-api = { version = "0.90.0", path = "crates/rest-api" }
111+
feldera-ir = { version = "0.90.0", path = "crates/ir" }
112112
flate2 = "1.1.0"
113113
form_urlencoded = "1.2.0"
114114
futures = "0.3.30"

openapi.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"license": {
1111
"name": "MIT OR Apache-2.0"
1212
},
13-
"version": "0.70.0"
13+
"version": "0.90.0"
1414
},
1515
"paths": {
1616
"/config/authentication": {

python/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ build-backend = "setuptools.build_meta"
66
name = "feldera"
77
readme = "README.md"
88
description = "The feldera python client"
9-
version = "0.70.0"
9+
version = "0.90.0"
1010
license = { text = "MIT" }
1111
requires-python = ">=3.10"
1212
authors = [
13-
{ "name" = "Abhinav", "email" = "abhinav.gyawali@feldera.com" },
13+
{ "name" = "Feldera Team", "email" = "dev@feldera.com" },
1414
]
1515
keywords = [
1616
"feldera",

python/uv.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)