Skip to content

Commit d9ff3a6

Browse files
Karakatiza666Karakatiza666
committed
Remove version from release artifact filenames except compiler .jar
Break up feldera-binaries-* artifact Other review fixes Signed-off-by: Karakatiza666 <bulakh.96@gmail.com>
1 parent 0bbb280 commit d9ff3a6

File tree

6 files changed

+47
-61
lines changed

6 files changed

+47
-61
lines changed

‎.github/workflows/build-docker.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,18 @@ jobs:
4949
fetch-tags: true
5050
persist-credentials: false
5151

52-
- name: Download Binaries
52+
- name: Download fda
5353
id: binaries
5454
uses: actions/download-artifact@v4
5555
with:
56-
name: feldera-binaries-${{ matrix.rust_target }}
56+
name: fda-${{ matrix.rust_target }}
57+
path: build
58+
59+
- name: Download pipeline-manager
60+
uses: actions/download-artifact@v4
61+
with:
62+
name: pipeline-manager-${{ matrix.rust_target }}
5763
path: build
58-
#run-id: ${{ inputs.run-id }}
59-
# Token is only needed when run-id is set
60-
#github-token: ${{ secrets.GITHUB_TOKEN }}
6164

6265
- name: Download Compiler Binaries
6366
uses: actions/download-artifact@v4

‎.github/workflows/build-rust.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,16 @@ jobs:
123123
path: build-artifacts
124124
retention-days: 7
125125

126-
# Upload binaries to run the product as another artifact
127-
- name: Upload release artifacts
126+
- name: Upload fda
128127
uses: actions/upload-artifact@v4
129128
with:
130-
name: feldera-binaries-${{ matrix.target }}
131-
path: build-release-artifacts
129+
name: fda-${{ matrix.target }}
130+
path: build-release-artifacts/fda
131+
retention-days: 7
132+
133+
- name: Upload pipeline-manager
134+
uses: actions/upload-artifact@v4
135+
with:
136+
name: pipeline-manager-${{ matrix.target }}
137+
path: build-release-artifacts/pipeline-manager
132138
retention-days: 7

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

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -70,33 +70,22 @@ jobs:
7070
workflow: ci.yml
7171
workflow_conclusion: success
7272
commit: ${{ env.SHA_TO_RELEASE }}
73-
name: feldera-sql-compiler-*|feldera-binaries-*|feldera-docs|feldera-sbom
73+
name: feldera-sql-compiler-*|fda-*|pipeline-manager-*|feldera-docs|feldera-sbom
7474
name_is_regexp: true
7575
skip_unpack: true
7676
if_no_artifact_found: fail
7777
github_token: ${{ steps.app-token.outputs.token }}
7878

79-
- name: Extract standalone fda binaries
79+
- name: Prepare release artifacts
8080
run: |
81-
for arch in x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu; do
82-
unzip -jo "feldera-binaries-${arch}.zip" fda -d .
83-
zip "fda-${arch}.zip" fda
84-
rm fda
85-
done
86-
87-
- name: Attach version to binaries
88-
run: |
89-
mv feldera-binaries-aarch64-unknown-linux-gnu.zip feldera-binaries-v${{ env.CURRENT_VERSION }}-aarch64-unknown-linux-gnu.zip
90-
mv feldera-binaries-x86_64-unknown-linux-gnu.zip feldera-binaries-v${{ env.CURRENT_VERSION }}-x86_64-unknown-linux-gnu.zip
9181
unzip -jo feldera-sql-compiler.zip 'sql2dbsp-jar-with-dependencies.jar' -d .
9282
mv sql2dbsp-jar-with-dependencies.jar sql2dbsp-jar-with-dependencies-v${{ env.CURRENT_VERSION }}.jar
93-
mv feldera-docs.zip feldera-docs-v${{ env.CURRENT_VERSION }}.zip
9483
9584
- name: Prepare SBOM files
9685
run: |
9786
unzip feldera-sbom.zip
98-
mv feldera-sbom-source-${{ env.SHA_TO_RELEASE }}.spdx.json feldera-sbom-source-v${{ env.CURRENT_VERSION }}.spdx.json
99-
mv feldera-sbom-image-${{ env.SHA_TO_RELEASE }}.spdx.json feldera-sbom-image-v${{ env.CURRENT_VERSION }}.spdx.json
87+
mv feldera-sbom-source-${{ env.SHA_TO_RELEASE }}.spdx.json feldera-sbom-source.spdx.json
88+
mv feldera-sbom-image-${{ env.SHA_TO_RELEASE }}.spdx.json feldera-sbom-image.spdx.json
10089
10190
- name: Generate Release token
10291
id: release-token
@@ -118,13 +107,13 @@ jobs:
118107
generate_release_notes: true
119108
make_latest: true
120109
files: |
121-
feldera-binaries-v${{ env.CURRENT_VERSION }}-aarch64-unknown-linux-gnu.zip
122-
feldera-binaries-v${{ env.CURRENT_VERSION }}-x86_64-unknown-linux-gnu.zip
110+
pipeline-manager-aarch64-unknown-linux-gnu.zip
111+
pipeline-manager-x86_64-unknown-linux-gnu.zip
123112
fda-x86_64-unknown-linux-gnu.zip
124113
fda-aarch64-unknown-linux-gnu.zip
125114
sql2dbsp-jar-with-dependencies-v${{ env.CURRENT_VERSION }}.jar
126-
feldera-sbom-source-v${{ env.CURRENT_VERSION }}.spdx.json
127-
feldera-sbom-image-v${{ env.CURRENT_VERSION }}.spdx.json
115+
feldera-sbom-source.spdx.json
116+
feldera-sbom-image.spdx.json
128117
# A custom token is necessary so the ci-post-release.yml workflow is triggered
129118
# see also https://github.com/softprops/action-gh-release/issues/59
130119
token: ${{ steps.release-token.outputs.token }}
@@ -136,15 +125,15 @@ jobs:
136125
role-session-name: gha-${{ github.run_id }}
137126
aws-region: ${{ vars.SQL2DBSP_S3_REGION }}
138127

139-
- name: Upload JAR to S3 with SHA in filename
128+
- name: Upload JAR to S3
140129
run: |
141130
JAR_FILE=sql2dbsp-jar-with-dependencies-v${{ env.CURRENT_VERSION }}.jar
142131
aws s3 cp "$JAR_FILE" "s3://${{ vars.SQL2DBSP_S3_BUCKET }}/$JAR_FILE" \
143132
--content-type application/java-archive
144133
145134
# Update docs.feldera.com
146135
- name: Update docs.feldera.com
147-
run: unzip feldera-docs-v${{ env.CURRENT_VERSION }}.zip -d docs
136+
run: unzip feldera-docs.zip -d docs
148137

149138
- name: Deploy docs.feldera.com
150139
if: ${{ vars.RELEASE_DRY_RUN == 'false' }}

‎.github/workflows/test-integration-platform.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ jobs:
228228
- name: Download fda binary
229229
uses: actions/download-artifact@v4
230230
with:
231-
name: feldera-binaries-${{ matrix.target }}
231+
name: fda-${{ matrix.target }}
232232
path: build
233233

234234
# Remove if https://github.com/actions/upload-artifact/issues/38 ever gets fixed

‎docs.feldera.com/docs/interface/cli.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ curl -fsSL https://feldera.com/install | bash
1717
| linux-x86_64 |
1818
| linux-aarch64 |
1919

20+
Requires glibc >= 2.39 (Ubuntu 24.04+, Debian 13+, Fedora 40+, RHEL 10+).
21+
2022

2123
### Installing a Specific Version
2224

@@ -59,11 +61,6 @@ cd crates/fda
5961
cargo install --path .
6062
```
6163

62-
### From release binaries
63-
64-
We supply pre-built binaries for `fda` as part of our release artifacts. You can find them in the
65-
`feldera-binaries` ZIP file in the [github release page](https://github.com/feldera/feldera/releases/latest).
66-
6764
### Optional: Shell completion
6865

6966
Once the `fda` binary is installed, you can enable shell command completion for `fda`

scripts/install-fda.sh renamed to docs.feldera.com/static/install-fda

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
set -eu
99

10-
GITHUB_REPO="feldera/feldera"
11-
1210
main() {
1311
need_cmd curl
1412
need_cmd unzip
@@ -79,25 +77,11 @@ detect_platform() {
7977
resolve_version() {
8078
if [ -n "${FDA_VERSION:-}" ]; then
8179
VERSION="$FDA_VERSION"
82-
DOWNLOAD_URL="https://github.com/$GITHUB_REPO/releases/download/${VERSION}/fda-${TARGET}.zip"
80+
DOWNLOAD_URL="https://github.com/feldera/feldera/releases/download/${VERSION}/fda-${TARGET}.zip"
8381
info "Installing fda ${VERSION}"
8482
else
85-
# Try to get the latest version from GitHub API
86-
VERSION=""
87-
API_RESPONSE=$(curl -fsSL "https://api.github.com/repos/$GITHUB_REPO/releases/latest" 2>/dev/null) || true
88-
if [ -n "$API_RESPONSE" ]; then
89-
# Extract tag_name from JSON without jq
90-
VERSION=$(printf '%s' "$API_RESPONSE" | sed -n 's/.*"tag_name"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p')
91-
fi
92-
93-
if [ -n "$VERSION" ]; then
94-
DOWNLOAD_URL="https://github.com/$GITHUB_REPO/releases/download/${VERSION}/fda-${TARGET}.zip"
95-
info "Installing fda ${VERSION} (latest)"
96-
else
97-
# Fall back to latest/download URL if API call fails
98-
DOWNLOAD_URL="https://github.com/$GITHUB_REPO/releases/latest/download/fda-${TARGET}.zip"
99-
info "Installing fda (latest)"
100-
fi
83+
DOWNLOAD_URL="https://github.com/feldera/feldera/releases/latest/download/fda-${TARGET}.zip"
84+
info "Installing fda (latest)"
10185
fi
10286
}
10387

@@ -113,7 +97,7 @@ download_and_install() {
11397
case "$HTTP_CODE" in
11498
404)
11599
if [ -n "${FDA_VERSION:-}" ]; then
116-
err "version ${FDA_VERSION} not found. Check available versions at https://github.com/$GITHUB_REPO/releases"
100+
err "version ${FDA_VERSION} not found. Check available versions at https://github.com/feldera/feldera/releases"
117101
else
118102
err "release asset not found. The latest release may not include standalone fda binaries yet."
119103
fi
@@ -150,25 +134,32 @@ setup_path() {
150134

151135
case "$SHELL_NAME" in
152136
bash)
153-
if [ -f "$HOME/.bashrc" ]; then
137+
if [ -f "$HOME/.bashrc" ] && ! grep -q FELDERA_INSTALL "$HOME/.bashrc"; then
154138
printf '\n# Feldera fda CLI\n%b\n' "$RC_LINES" >> "$HOME/.bashrc"
139+
# shellcheck disable=SC2088
155140
UPDATED_RC="~/.bashrc"
156-
elif [ -f "$HOME/.bash_profile" ]; then
141+
elif [ -f "$HOME/.bash_profile" ] && ! grep -q FELDERA_INSTALL "$HOME/.bash_profile"; then
157142
printf '\n# Feldera fda CLI\n%b\n' "$RC_LINES" >> "$HOME/.bash_profile"
143+
# shellcheck disable=SC2088
158144
UPDATED_RC="~/.bash_profile"
159145
fi
160146
;;
161147
zsh)
162-
if [ -f "$HOME/.zshrc" ] || [ -d "$HOME" ]; then
148+
if [ -f "$HOME/.zshrc" ] && ! grep -q FELDERA_INSTALL "$HOME/.zshrc"; then
163149
printf '\n# Feldera fda CLI\n%b\n' "$RC_LINES" >> "$HOME/.zshrc"
150+
# shellcheck disable=SC2088
164151
UPDATED_RC="~/.zshrc"
165152
fi
166153
;;
167154
fish)
168155
FISH_CONFIG="$HOME/.config/fish/config.fish"
169156
if [ -d "$HOME/.config/fish" ] || mkdir -p "$HOME/.config/fish"; then
170-
printf '\n# Feldera fda CLI\nset -gx FELDERA_INSTALL %s\nset -gx PATH $FELDERA_INSTALL/bin $PATH\n' "$FELDERA_INSTALL" >> "$FISH_CONFIG"
171-
UPDATED_RC="~/.config/fish/config.fish"
157+
if ! grep -q FELDERA_INSTALL "$FISH_CONFIG" 2>/dev/null; then
158+
# shellcheck disable=SC2016
159+
printf '\n# Feldera fda CLI\nset -gx FELDERA_INSTALL %s\nset -gx PATH $FELDERA_INSTALL/bin $PATH\n' "$FELDERA_INSTALL" >> "$FISH_CONFIG"
160+
# shellcheck disable=SC2088
161+
UPDATED_RC="~/.config/fish/config.fish"
162+
fi
172163
fi
173164
;;
174165
esac

0 commit comments

Comments
 (0)