Skip to content

Commit 70f77a6

Browse files
author
Pat
authored
release: updates for 2.1.2 (#1090)
* workflows: automate version updates * workflows: tweak docker * workflows: update for Windows Signed-off-by: Patrick Stephens <pat@calyptia.com>
1 parent 5be8e4d commit 70f77a6

File tree

4 files changed

+65
-11
lines changed

4 files changed

+65
-11
lines changed

.github/workflows/pr-lint.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
./actionlint -color -shellcheck=
1616
shell: bash
1717
18-
docslint-pr:
18+
shellcheck-pr:
1919
runs-on: ubuntu-latest
20-
name: PR - Markdownlint
20+
name: PR - Shellcheck
2121
steps:
22-
- name: Run markdownlint
23-
uses: actionshub/markdownlint@v3.1.3
22+
- uses: actions/checkout@v3
23+
- uses: ludeeus/action-shellcheck@master

installation/docker.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ The following table describes the Linux container tags that are available on Doc
1717

1818
| Tag(s) | Manifest Architectures | Description |
1919
| ------------ | ------------------------- | -------------------------------------------------------------- |
20+
| 2.1.2 | x86_64, arm64v8, arm32v7 | Debug images |
21+
| 2.1.2-debug | x86_64, arm64v8, arm32v7 | Release [v2.1.2](https://fluentbit.io/announcements/v2.1.2/) |
2022
| 2.1.1 | x86\_64, arm64v8, arm32v7 | Release [v2.1.1](https://fluentbit.io/announcements/v2.1.1/) |
2123
| 2.1.1-debug | x86\_64, arm64v8, arm32v7 | v2.1.x releases (production + debug) |
2224
| 2.1.0 | x86\_64, arm64v8, arm32v7 | Release [v2.1.0](https://fluentbit.io/announcements/v2.1.0/) |

installation/windows.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,19 @@ From version 1.9, `td-agent-bit` is a deprecated package and was removed after 1
7979

8080
## Installation Packages
8181

82-
The latest stable version is 2.1.1, each version is available on the Github release as well as at :
82+
The latest stable version is 2.1.2 each version is available on the Github release as well as at :
8383

8484
| INSTALLERS | SHA256 CHECKSUMS |
8585
| ------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------- |
86-
| [fluent-bit-2.1.1-win32.exe](https://releases.fluentbit.io/2.1/fluent-bit-2.1.1-win32.exe) | [dda7d881ab2d828bf1ef6add59dbd1562ece0a96e7c99dd87a139c7b0f9cd3fc](https://releases.fluentbit.io/2.0/fluent-bit-2.1.1-win32.exe.sha256) |
87-
| [fluent-bit-2.1.1-win32.zip](https://releases.fluentbit.io/2.1/fluent-bit-2.1.1-win32.zip) | [5a1e12750d3d78653fbb470983f6eca68bde31fa31466a8d38e5faab49d5453e](https://releases.fluentbit.io/2.0/fluent-bit-2.1.1-win32.zip.sha256) |
88-
| [fluent-bit-2.1.1-win64.exe](https://releases.fluentbit.io/2.1/fluent-bit-2.1.1-win64.exe) | [d8bf46520d61c74030818a77aa2382caf99e8d098f88f0233e366d97d06dc4cc](https://releases.fluentbit.io/2.0/fluent-bit-2.1.1-win64.exe.sha256) |
89-
| [fluent-bit-2.1.1-win64.zip](https://releases.fluentbit.io/2.1/fluent-bit-2.1.1-win64.zip) | [72cbe76133c028bb4f56e28bca0d94d842613c2c2bdd515bedf85a624beffe30](https://releases.fluentbit.io/2.0/fluent-bit-2.1.1-win64.zip.sha256) |
86+
| [fluent-bit-2.1.2-win32.exe](https://releases.fluentbit.io/2.1/fluent-bit-2.1.2-win32.exe) | [fa1a6c6a1d8dcf3bff34aca35e52b7c9159d63d2d4602c3862407dde7a8ff0d2](https://releases.fluentbit.io/2.1/fluent-bit-2.1.2-win32.exe.sha256) |
87+
| [fluent-bit-2.1.2-win32.zip](https://releases.fluentbit.io/2.1/fluent-bit-2.1.2-win32.zip) | [94a1d238163b052ebcfa25708e6d10cef418fed0625afc1014186ca9e5eded7c](https://releases.fluentbit.io/2.1/fluent-bit-2.1.2-win32.zip.sha256) |
88+
| [fluent-bit-2.1.2-win64.exe](https://releases.fluentbit.io/2.1/fluent-bit-2.1.2-win64.exe) | [d53b3239dac064b2308590b7a5ccaa54cb277f8201d4283976775b0478253c85](https://releases.fluentbit.io/2.1/fluent-bit-2.1.2-win64.exe.sha256) |
89+
| [fluent-bit-2.1.2-win64.zip](https://releases.fluentbit.io/2.1/fluent-bit-2.1.2-win64.zip) | [aca353818b1c06cf51f3080c59d7dce973fc3244dcd09c229206bf9d9cbcb61b](https://releases.fluentbit.io/2.1/fluent-bit-2.1.2-win64.zip.sha256) |
9090

9191
To check the integrity, use `Get-FileHash` cmdlet on PowerShell.
9292

9393
```powershell
94-
PS> Get-FileHash fluent-bit-2.0.9-win32.exe
94+
PS> Get-FileHash fluent-bit-2.1.2-win32.exe
9595
```
9696

9797
## Installing from ZIP archive
@@ -101,7 +101,7 @@ Download a ZIP archive from above. There are installers for 32-bit and 64-bit en
101101
Then you need to expand the ZIP archive. You can do this by clicking "Extract All" on Explorer, or if you're using PowerShell, you can use `Expand-Archive` cmdlet.
102102

103103
```powershell
104-
PS> Expand-Archive fluent-bit-2.0.9-win64.zip
104+
PS> Expand-Archive fluent-bit-2.1.2-win64.zip
105105
```
106106

107107
The ZIP package contains the following set of files.

update-release-version-docs.sh

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
#!/bin/bash
2+
set -eux
3+
4+
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
5+
6+
function sed_wrapper() {
7+
if sed --version >/dev/null 2>&1; then
8+
$(which sed) "$@"
9+
else
10+
if command -v gsed >/dev/null 2>&1 ; then
11+
# homebrew gnu-sed is required on MacOS
12+
gsed "$@"
13+
else
14+
echo "ERROR: No valid GNU compatible 'sed' found, if on macOS please run 'brew install gnu-sed'" >&2
15+
exit 1
16+
fi
17+
fi
18+
}
19+
20+
NEW_VERSION=${NEW_VERSION:?}
21+
if [[ -z "$NEW_VERSION" ]]; then
22+
echo "Missing VERSION value"
23+
exit 1
24+
fi
25+
26+
MAJOR_VERSION=${MAJOR_VERSION:-}
27+
if [[ -z "$MAJOR_VERSION" ]]; then
28+
MAJOR_VERSION=${VERSION%.*}
29+
fi
30+
31+
# Add Docker after first line in the table
32+
if grep -q "$NEW_VERSION" "$SCRIPT_DIR"/installation/docker.md; then
33+
echo "Found $NEW_VERSION already in the Docker docs so skipping update"
34+
else
35+
sed_wrapper -i -e "/| -.*$/a | $NEW_VERSION-debug | x86\_64, arm64v8, arm32v7 | Release [v$NEW_VERSION](https://fluentbit.io/announcements/v$NEW_VERSION/) |" "$SCRIPT_DIR"/installation/docker.md
36+
sed_wrapper -i -e "/| -.*$/a | $NEW_VERSION | x86\_64, arm64v8, arm32v7 | Debug images |" "$SCRIPT_DIR"/installation/docker.md
37+
fi
38+
39+
WIN_32_EXE_HASH=${WIN_32_EXE_HASH:?}
40+
WIN_32_ZIP_HASH=${WIN_32_ZIP_HASH:?}
41+
WIN_64_EXE_HASH=${WIN_64_EXE_HASH:?}
42+
WIN_64_ZIP_HASH=${WIN_64_ZIP_HASH:?}
43+
44+
sed_wrapper -i -e "s/The latest stable version is .*,/The latest stable version is $NEW_VERSION/g" "$SCRIPT_DIR"/installation/windows.md
45+
sed_wrapper -i -e "s/fluent-bit-[0-9\.]*-win/fluent-bit-$NEW_VERSION-win/g" "$SCRIPT_DIR"/installation/windows.md
46+
47+
sed_wrapper -i -e "s|releases.fluentbit.io/[0-9\.]*/|releases.fluentbit.io/$MAJOR_VERSION/|g" "$SCRIPT_DIR"/installation/windows.md
48+
49+
sed_wrapper -i -e "s/win32.exe) | \[.*\]/win32.exe) | \[$WIN_32_EXE_HASH\]/g" "$SCRIPT_DIR"/installation/windows.md
50+
sed_wrapper -i -e "s/win32.zip) | \[.*\]/win32.zip) | \[$WIN_32_ZIP_HASH\]/g" "$SCRIPT_DIR"/installation/windows.md
51+
sed_wrapper -i -e "s/win64.exe) | \[.*\]/win64.exe) | \[$WIN_64_EXE_HASH\]/g" "$SCRIPT_DIR"/installation/windows.md
52+
sed_wrapper -i -e "s/win64.zip) | \[.*\]/win64.zip) | \[$WIN_64_ZIP_HASH\]/g" "$SCRIPT_DIR"/installation/windows.md

0 commit comments

Comments
 (0)