Skip to content

Commit 5d3be32

Browse files
avifeneshshohamazon
avifenesh
and
shohamazon
committed
CI - Minimal and full CI matrix impl (valkey-io#2051)
* CI - Minimal and full CI matrix impl Signed-off-by: avifenesh <aviarchi1994@gmail.com> * Fix mypy failing (valkey-io#2453) --------- Signed-off-by: Shoham Elias <shohame@amazon.com> Signed-off-by: avifenesh <aviarchi1994@gmail.com> * Python: adds JSON.ARRLEN command (valkey-io#2403) --------- Signed-off-by: Shoham Elias <shohame@amazon.com> Signed-off-by: Shoham Elias <116083498+shohamazon@users.noreply.github.com> Signed-off-by: avifenesh <aviarchi1994@gmail.com> --------- Signed-off-by: avifenesh <aviarchi1994@gmail.com> Signed-off-by: Shoham Elias <shohame@amazon.com> Signed-off-by: Shoham Elias <116083498+shohamazon@users.noreply.github.com> Co-authored-by: Shoham Elias <116083498+shohamazon@users.noreply.github.com>
1 parent 72b6fcd commit 5d3be32

File tree

12 files changed

+7
-208
lines changed

12 files changed

+7
-208
lines changed

‎.github/json_matrices/build-matrix.json‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,11 @@
55
"RUNNER": "ubuntu-latest",
66
"ARCH": "x64",
77
"TARGET": "x86_64-unknown-linux-gnu",
8-
<<<<<<< HEAD
98
"PACKAGE_MANAGERS": [
109
"pypi",
1110
"npm",
1211
"maven"
1312
]
14-
=======
15-
"PACKAGE_MANAGERS": ["pypi", "npm"],
16-
"run": ["always", "python", "node", "java"]
17-
>>>>>>> bcc6b00b (CI - Minimal and full CI matrix impl (#2051))
1813
},
1914
{
2015
"OS": "ubuntu",
@@ -26,52 +21,36 @@
2621
],
2722
"ARCH": "arm64",
2823
"TARGET": "aarch64-unknown-linux-gnu",
29-
<<<<<<< HEAD
3024
"PACKAGE_MANAGERS": [
3125
"pypi",
3226
"npm",
3327
"maven"
3428
],
3529
"CONTAINER": "2_28"
36-
=======
37-
"PACKAGE_MANAGERS": ["pypi", "npm"],
38-
"CONTAINER": "2_28",
39-
"run": ["python", "node", "java"]
40-
>>>>>>> bcc6b00b (CI - Minimal and full CI matrix impl (#2051))
4130
},
4231
{
4332
"OS": "macos",
4433
"NAMED_OS": "darwin",
4534
"RUNNER": "macos-12",
4635
"ARCH": "x64",
4736
"TARGET": "x86_64-apple-darwin",
48-
<<<<<<< HEAD
4937
"PACKAGE_MANAGERS": [
5038
"pypi",
5139
"npm",
5240
"maven"
5341
]
54-
=======
55-
"PACKAGE_MANAGERS": ["pypi", "npm"],
56-
"run": ["python", "node", "java"]
57-
>>>>>>> bcc6b00b (CI - Minimal and full CI matrix impl (#2051))
5842
},
5943
{
6044
"OS": "macos",
6145
"NAMED_OS": "darwin",
6246
"RUNNER": "macos-latest",
6347
"ARCH": "arm64",
6448
"TARGET": "aarch64-apple-darwin",
65-
<<<<<<< HEAD
6649
"PACKAGE_MANAGERS": [
6750
"pypi",
6851
"npm",
6952
"maven"
7053
]
71-
=======
72-
"PACKAGE_MANAGERS": ["pypi", "npm"],
73-
"run": ["python", "node", "java"]
74-
>>>>>>> bcc6b00b (CI - Minimal and full CI matrix impl (#2051))
7554
},
7655
{
7756
"OS": "ubuntu",
@@ -85,14 +64,9 @@
8564
],
8665
"IMAGE": "node:lts-alpine3.19",
8766
"CONTAINER_OPTIONS": "--user root --privileged --rm",
88-
<<<<<<< HEAD
8967
"PACKAGE_MANAGERS": [
9068
"npm"
9169
]
92-
=======
93-
"PACKAGE_MANAGERS": ["npm"],
94-
"run": ["node"]
95-
>>>>>>> bcc6b00b (CI - Minimal and full CI matrix impl (#2051))
9670
},
9771
{
9872
"OS": "ubuntu",
@@ -102,13 +76,8 @@
10276
"RUNNER": "ubuntu-latest",
10377
"IMAGE": "node:lts-alpine3.19",
10478
"CONTAINER_OPTIONS": "--user root --privileged",
105-
<<<<<<< HEAD
10679
"PACKAGE_MANAGERS": [
10780
"npm"
10881
]
109-
=======
110-
"PACKAGE_MANAGERS": ["npm"],
111-
"run": ["node"]
112-
>>>>>>> bcc6b00b (CI - Minimal and full CI matrix impl (#2051))
11382
}
11483
]

‎.github/workflows/codeql.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,21 @@ name: "CodeQL"
22

33
on:
44
push:
5-
<<<<<<< HEAD
6-
branches:
7-
=======
85
branches:
9-
>>>>>>> bcc6b00b (CI - Minimal and full CI matrix impl (#2051))
106
- "main"
117
- "v.?[0-9]+.[0-9]+.[0-9]+"
128
- "v.?[0-9]+.[0-9]+"
139
- "v?[0-9]+.[0-9]+.[0-9]+"
1410
- "v?[0-9]+.[0-9]+"
15-
<<<<<<< HEAD
1611
- release-*
17-
pull_request:
18-
branches:
19-
=======
2012
pull_request:
2113
branches:
22-
>>>>>>> bcc6b00b (CI - Minimal and full CI matrix impl (#2051))
2314
- "main"
2415
- "v.?[0-9]+.[0-9]+.[0-9]+"
2516
- "v.?[0-9]+.[0-9]+"
2617
- "v?[0-9]+.[0-9]+.[0-9]+"
2718
- "v?[0-9]+.[0-9]+"
28-
<<<<<<< HEAD
2919
- release-*
30-
=======
31-
>>>>>>> bcc6b00b (CI - Minimal and full CI matrix impl (#2051))
3220
schedule:
3321
- cron: "37 18 * * 6"
3422

‎.github/workflows/go.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@ name: Go CI
22

33
on:
44
push:
5-
<<<<<<< HEAD
65
branches:
76
- main
87
- release-*
98
- v*
10-
=======
11-
branches: ["main"]
12-
>>>>>>> bcc6b00b (CI - Minimal and full CI matrix impl (#2051))
139
paths:
1410
- glide-core/src/**
1511
- glide-core/redis-rs/redis/src/**
@@ -77,7 +73,6 @@ jobs:
7773

7874
steps:
7975
- uses: actions/checkout@v4
80-
8176

8277
- name: Set up Go ${{ matrix.go }}
8378
uses: actions/setup-go@v5
@@ -207,7 +202,6 @@ jobs:
207202
runs-on: ubuntu-latest
208203
steps:
209204
- uses: actions/checkout@v4
210-
211205

212206
- uses: ./.github/workflows/lint-rust
213207
with:

‎.github/workflows/install-shared-dependencies/action.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,8 @@ inputs:
2323
- x86_64-unknown-linux-musl
2424
engine-version:
2525
description: "Engine version to install"
26-
<<<<<<< HEAD
2726
required: false
2827
type: string
29-
=======
30-
required: true
31-
type: string
32-
33-
>>>>>>> bcc6b00b (CI - Minimal and full CI matrix impl (#2051))
3428
github-token:
3529
description: "GITHUB_TOKEN, GitHub App installation access token"
3630
required: true

‎.github/workflows/node.yml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -51,24 +51,7 @@ env:
5151
CARGO_TERM_COLOR: always
5252

5353
jobs:
54-
<<<<<<< HEAD
55-
load-engine-matrix:
56-
runs-on: ubuntu-latest
57-
outputs:
58-
matrix: ${{ steps.load-engine-matrix.outputs.matrix }}
59-
steps:
60-
- name: Checkout
61-
uses: actions/checkout@v4
62-
63-
- name: Load the engine matrix
64-
id: load-engine-matrix
65-
shell: bash
66-
run: echo "matrix=$(jq -c . < .github/json_matrices/engine-matrix.json)" >> $GITHUB_OUTPUT
67-
68-
test-ubuntu-latest:
69-
=======
7054
get-matrices:
71-
>>>>>>> bcc6b00b (CI - Minimal and full CI matrix impl (#2051))
7255
runs-on: ubuntu-latest
7356
# Avoid running on schedule for forks
7457
if: (github.repository_owner == 'valkey-io' || github.event_name != 'schedule')
@@ -97,17 +80,11 @@ jobs:
9780
node: ${{ fromJson(needs.get-matrices.outputs.version-matrix-output)}}
9881
steps:
9982
- uses: actions/checkout@v4
100-
10183

102-
<<<<<<< HEAD
103-
- name: Use Node.js 16.x
104-
uses: actions/setup-node@v4
105-
=======
10684
- name: Setup Node
10785
uses: actions/setup-node@v4
10886
env:
10987
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
110-
>>>>>>> bcc6b00b (CI - Minimal and full CI matrix impl (#2051))
11188
with:
11289
node-version: ${{ matrix.node }}
11390

@@ -161,7 +138,6 @@ jobs:
161138
runs-on: ubuntu-latest
162139
steps:
163140
- uses: actions/checkout@v4
164-
165141

166142
- name: lint node rust
167143
uses: ./.github/workflows/lint-rust
@@ -232,7 +208,6 @@ jobs:
232208
apk add git
233209
234210
- uses: actions/checkout@v4
235-
236211

237212
- name: Setup musl on Linux
238213
uses: ./.github/workflows/setup-musl-on-linux
@@ -278,7 +253,6 @@ jobs:
278253
run: sudo chown -R $USER:$USER /home/ubuntu/actions-runner/_work/valkey-glide
279254

280255
- uses: actions/checkout@v4
281-
282256

283257
- name: Use Node.js 16.x
284258
uses: actions/setup-node@v4

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -203,16 +203,11 @@ jobs:
203203
if: ${{ matrix.build.ARCH == 'arm64' }}
204204
shell: bash
205205
run: |
206-
<<<<<<< HEAD
207-
echo "Resetting repository"
208-
git clean -xdf
209-
git reset --hard
210-
git fetch
211-
git checkout ${{ github.sha }}
212-
=======
213-
git reset --hard
206+
echo "Resetting repository"
214207
git clean -xdf
215-
>>>>>>> bcc6b00b (CI - Minimal and full CI matrix impl (#2051))
208+
git reset --hard
209+
git fetch
210+
git checkout ${{ github.sha }}
216211
217212
publish-base-to-npm:
218213
if: github.event_name != 'pull_request'

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -112,18 +112,7 @@ jobs:
112112
if: ${{ !contains(matrix.build.RUNNER, 'self-hosted') }}
113113
uses: actions/setup-python@v5
114114
with:
115-
<<<<<<< HEAD
116115
python-version: "3.12"
117-
=======
118-
python-version: "3.10"
119-
120-
- name: Set up Python older versions for MacOS
121-
if: startsWith(matrix.build.NAMED_OS, 'darwin')
122-
run: |
123-
brew update
124-
brew install python@3.9
125-
126-
>>>>>>> bcc6b00b (CI - Minimal and full CI matrix impl (#2051))
127116

128117
- name: Setup Python for self-hosted Ubuntu runners
129118
if: contains(matrix.build.RUNNER, 'self-hosted')

0 commit comments

Comments
 (0)