Skip to content

Commit ae6a53c

Browse files
jbrinkmanjbrinkman
authored
[Backport 1.3) Merge release 1.3 to main (valkey-io#3202)
Backport 1.3 to main --------- Signed-off-by: Joe Brinkman <joe.brinkman@improving.com>
1 parent 4de9ae4 commit ae6a53c

File tree

105 files changed

+2564
-1619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+2564
-1619
lines changed

‎.github/workflows/go-cd.yml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ jobs:
3333
id: load-platform-matrix
3434
shell: bash
3535
run: |
36-
# Filter entries with pkg_go_dev in PACKAGE_MANAGERS and remove "ephemeral" from RUNNER
36+
# Filter entries with pkg_go_dev in PACKAGE_MANAGERS and replace "ephemeral" with "persistent" in RUNNER
3737
export PLATFORM_MATRIX=$(jq 'map(
38-
select(.PACKAGE_MANAGERS != null and (.PACKAGE_MANAGERS | contains(["pkg_go_dev"])))
38+
select(.PACKAGE_MANAGERS != null and (.PACKAGE_MANAGERS | contains(["pkg_go_dev"])))
3939
| .RUNNER = (
4040
if (.RUNNER | type == "array")
41-
then (.RUNNER | map(select(. != "ephemeral")))
42-
else .RUNNER
41+
then (.RUNNER | map(if . == "ephemeral" then "persistent" else . end))
42+
else (if . == "ephemeral" then "persistent" else . end)
4343
end
4444
)
4545
)' < .github/json_matrices/build-matrix.json | jq -c .)
@@ -148,13 +148,14 @@ jobs:
148148
cp protobuf/* $GITHUB_WORKSPACE/go/protobuf/
149149
- name: Commit and push tag
150150
run: |
151+
RELEASE_VERSION=${{ needs.validate-release-version.outputs.RELEASE_VERSION }}
151152
git config user.name github-actions
152153
git config user.email github-actions@github.com
153154
git add -f .
154155
git commit -m "Automated commit from GitHub Actions"
155-
git tag go/${{ needs.validate-release-version.outputs.RELEASE_VERSION }}
156-
git push origin go/${{ needs.validate-release-version.outputs.RELEASE_VERSION }}
157-
GOPROXY=proxy.golang.org go list -m github.com/valkey-io/valkey-glide/go@${{ needs.validate-release-version.outputs.RELEASE_VERSION }}
156+
git tag go/$RELEASE_VERSION
157+
git push origin go/$RELEASE_VERSION
158+
GOPROXY=proxy.golang.org go list -m github.com/valkey-io/valkey-glide/go@$RELEASE_VERSION
158159
159160
extra-post-commit-test:
160161
needs:
@@ -204,13 +205,13 @@ jobs:
204205
working-directory: go/benchmarks
205206
run: |
206207
# change go/benchmarks/go.mod on the fly
207-
export ESCAPED_VERSION=$(echo "${{ needs.validate-release-version.outputs.RELEASE_VERSION }}" | sed 's/\./\\./g')
208+
RELEASE_VERSION=${{ needs.validate-release-version.outputs.RELEASE_VERSION }}
208209
if [[ "${{ matrix.host.OS }}" == "macos" ]]; then
209-
sed -i '' '/replace github\.com\/valkey-io\/valkey-glide\/go/d' go.mod
210-
sed -i '' "s/github\.com\/valkey-io\/valkey-glide\/go v0\.0\.0/github.com\/valkey-io\/valkey-glide\/go $ESCAPED_VERSION/g" go.mod
210+
sed -i '' '\|replace github\.com/valkey-io/valkey-glide/go|d' go.mod
211+
sed -i '' "s|github\.com/valkey-io/valkey-glide/go v.*|github.com/valkey-io/valkey-glide/go $RELEASE_VERSION|g" go.mod
211212
else
212-
sed -i '/replace github\.com\/valkey-io\/valkey-glide\/go/d' go.mod
213-
sed -i "s/github\.com\/valkey-io\/valkey-glide\/go v0\.0\.0/github.com\/valkey-io\/valkey-glide\/go $ESCAPED_VERSION/g" go.mod
213+
sed -i '\|replace github\.com/valkey-io/valkey-glide/go|d' go.mod
214+
sed -i "s|github\.com/valkey-io/valkey-glide/go v.*|github.com/valkey-io/valkey-glide/go $RELEASE_VERSION|g" go.mod
214215
fi
215216
go mod tidy
216217
go run . -minimal -clients glide -concurrentTasks 10 -port ${{ env.PORT }}

‎.github/workflows/go.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ jobs:
225225
if: (github.repository_owner == 'valkey-io' && github.event_name == 'workflow_dispatch') || github.event.pull_request.head.repo.owner.login == 'valkey-io'
226226
environment: AWS_ACTIONS
227227
name: Modules Tests
228-
runs-on: [self-hosted, linux, ARM64]
228+
runs-on: [self-hosted, linux, ARM64, persistent]
229229
timeout-minutes: 15
230230
steps:
231231
- name: Setup self-hosted runner access

‎.github/workflows/install-engine/action.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ runs:
2626
# TODO: self-hosted runners are actually cloning the repo, using the cache from the previous run
2727
# will not work as expected. We need to find a way to cache the valkey repo on the runner itself.
2828
steps:
29-
- name: Cache Valkey
29+
- name: Cache Valkey for non self hosted runners
3030
if: ${{!contains(inputs.target, 'aarch64-unknown') }}
3131
uses: actions/cache@v4
3232
id: cache-valkey
@@ -35,18 +35,21 @@ runs:
3535
~/valkey
3636
key: valkey-${{ inputs.engine-version }}-${{ inputs.target }}
3737

38-
# if no cache hit, build the engine
39-
- name: Build Valkey
38+
- name: Prepare Valkey sources
4039
if: ${{ steps.cache-valkey.outputs.cache-hit != 'true' }}
4140
shell: bash
4241
run: |
43-
echo "Building valkey ${{ inputs.engine-version }}"
44-
cd ~
42+
echo "Cloning and checking out Valkey ${{ inputs.engine-version }}"
43+
cd ~/
44+
if [[ -d valkey ]]; then
45+
echo "Removing existing valkey directory..."
46+
rm -fR valkey
47+
fi
4548
git clone https://github.com/valkey-io/valkey.git
4649
cd valkey
4750
git checkout ${{ inputs.engine-version }}
4851
49-
- name: Install engine
52+
- name: Build and install engine
5053
shell: bash
5154
run: |
5255
cd ~/valkey

‎.github/workflows/java-cd.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
id: load-platform-matrix
3636
shell: bash
3737
run: |
38-
# Filter entries with maven in PACKAGE_MANAGERS and remove "ephemeral" from RUNNER
38+
# Filter entries with maven in PACKAGE_MANAGERS and replace "ephemeral" with "persistent" in RUNNER
3939
export PLATFORM_MATRIX=$(jq 'map(
40-
select(.PACKAGE_MANAGERS != null and (.PACKAGE_MANAGERS | contains(["maven"])))
40+
select(.PACKAGE_MANAGERS != null and (.PACKAGE_MANAGERS | contains(["maven"])))
4141
| .RUNNER = (
4242
if (.RUNNER | type == "array")
43-
then (.RUNNER | map(select(. != "ephemeral")))
44-
else .RUNNER
43+
then (.RUNNER | map(if . == "ephemeral" then "persistent" else . end))
44+
else (if . == "ephemeral" then "persistent" else . end)
4545
end
4646
)
4747
)' < .github/json_matrices/build-matrix.json | jq -c .)

‎.github/workflows/java.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ jobs:
218218
if: (github.repository_owner == 'valkey-io' && github.event_name == 'workflow_dispatch') || github.event.pull_request.head.repo.owner.login == 'valkey-io'
219219
environment: AWS_ACTIONS
220220
name: Modules Tests
221-
runs-on: [self-hosted, linux, ARM64]
221+
runs-on: [self-hosted, linux, ARM64, persistent]
222222
timeout-minutes: 15
223223
steps:
224224
- name: Setup self-hosted runner access

‎.github/workflows/node.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ jobs:
246246
if: (github.repository_owner == 'valkey-io' && github.event_name == 'workflow_dispatch') || github.event.pull_request.head.repo.owner.login == 'valkey-io'
247247
environment: AWS_ACTIONS
248248
name: Running Module Tests
249-
runs-on: [self-hosted, linux, ARM64]
249+
runs-on: [self-hosted, linux, ARM64, persistent]
250250
timeout-minutes: 15
251251

252252
steps:

‎.github/workflows/npm-cd.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ jobs:
5959
id: load-platform-matrix
6060
shell: bash
6161
run: |
62-
# Filter entries with npm in PACKAGE_MANAGERS and remove "ephemeral" from RUNNER
62+
# Filter entries with npm in PACKAGE_MANAGERS and replace "ephemeral" with "persistent" in RUNNER
6363
export PLATFORM_MATRIX=$(jq 'map(
64-
select(.PACKAGE_MANAGERS != null and (.PACKAGE_MANAGERS | contains(["npm"])))
64+
select(.PACKAGE_MANAGERS != null and (.PACKAGE_MANAGERS | contains(["npm"])))
6565
| .RUNNER = (
6666
if (.RUNNER | type == "array")
67-
then (.RUNNER | map(select(. != "ephemeral")))
68-
else .RUNNER
67+
then (.RUNNER | map(if . == "ephemeral" then "persistent" else . end))
68+
else (if . == "ephemeral" then "persistent" else . end)
6969
end
7070
)
7171
)' < .github/json_matrices/build-matrix.json | jq -c .)

‎.github/workflows/pypi-cd.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ jobs:
4141
id: load-platform-matrix
4242
shell: bash
4343
run: |
44-
# Filter entries with pypi in PACKAGE_MANAGERS and remove "ephemeral" from RUNNER
44+
# Filter entries with pypi in PACKAGE_MANAGERS and replace "ephemeral" with "persistent" in RUNNER
4545
export PLATFORM_MATRIX=$(jq 'map(
46-
select(.PACKAGE_MANAGERS != null and (.PACKAGE_MANAGERS | contains(["pypi"])))
46+
select(.PACKAGE_MANAGERS != null and (.PACKAGE_MANAGERS | contains(["pypi"])))
4747
| .RUNNER = (
4848
if (.RUNNER | type == "array")
49-
then (.RUNNER | map(select(. != "ephemeral")))
50-
else .RUNNER
49+
then (.RUNNER | map(if . == "ephemeral" then "persistent" else . end))
50+
else (if . == "ephemeral" then "persistent" else . end)
5151
end
5252
)
5353
)' < .github/json_matrices/build-matrix.json | jq -c .)
@@ -171,7 +171,7 @@ jobs:
171171
PROTOC_ARCH="x86_64"
172172
elif [[ $ARCH == 'aarch64' ]]; then
173173
PROTOC_ARCH="aarch_64"
174-
export CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc
174+
export CC_aarch64_unknown_linux_gnu=gcc
175175
export CFLAGS_aarch64_unknown_linux_gnu="-march=armv8-a"
176176
else
177177
echo "Running on unsupported architecture: $ARCH. Expected one of: ['x86_64', 'aarch64']"

‎.github/workflows/python.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ jobs:
303303
if: (github.repository_owner == 'valkey-io' && github.event_name == 'workflow_dispatch') || github.event.pull_request.head.repo.owner.login == 'valkey-io'
304304
environment: AWS_ACTIONS
305305
name: Running Module Tests
306-
runs-on: [self-hosted, linux, ARM64]
306+
runs-on: [self-hosted, linux, ARM64, persistent]
307307
timeout-minutes: 15
308308

309309
steps:

‎.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,6 @@
6060
],
6161
"rust-analyzer.cargo.features": "all",
6262
"dotnet.defaultSolution": "csharp/csharp.sln",
63-
"java.compile.nullAnalysis.mode": "automatic"
63+
"java.compile.nullAnalysis.mode": "automatic",
64+
"java.configuration.updateBuildConfiguration": "interactive"
6465
}

0 commit comments

Comments
 (0)