Skip to content

Commit 2b6b2bd

Browse files
AsatyamAsatyam
authored
Merge branch 'main' into fix_index_cleaner_date
2 parents c7a2a85 + 9a869dc commit 2b6b2bd

File tree

137 files changed

+4055
-1491
lines changed

Some content is hidden

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

137 files changed

+4055
-1491
lines changed

‎.github/actions/setup-go-tip/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ runs:
4545
if: steps.download.outputs.success == 'false'
4646
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
4747
with:
48-
go-version: 1.23.x
48+
go-version: 1.24.x
4949

5050
- name: Build Go Tip from source
5151
if: steps.download.outputs.success == 'false'

‎.github/workflows/ci-build-binaries.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Build binaries
22

33
on:
4+
merge_group:
45
push:
56
branches: [main]
67

@@ -35,7 +36,7 @@ jobs:
3536
matrix: ${{fromJson(needs.generate-matrix.outputs.matrix)}}
3637
name: build-binaries-${{ matrix.os }}-${{ matrix.arch }}
3738
steps:
38-
- uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
39+
- uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
3940
with:
4041
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
4142

@@ -49,7 +50,7 @@ jobs:
4950
5051
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
5152
with:
52-
go-version: 1.23.x
53+
go-version: 1.24.x
5354

5455
- name: Setup Node.js version
5556
uses: ./.github/actions/setup-node.js

‎.github/workflows/ci-crossdock.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: CIT Crossdock
22

33
on:
4+
merge_group:
45
push:
56
branches: [main]
67

@@ -20,7 +21,7 @@ jobs:
2021
runs-on: ubuntu-latest
2122

2223
steps:
23-
- uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
24+
- uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
2425
with:
2526
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
2627

@@ -34,13 +35,13 @@ jobs:
3435
3536
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
3637
with:
37-
go-version: 1.23.x
38+
go-version: 1.24.x
3839

3940
- uses: ./.github/actions/setup-branch
4041

4142
- run: make install-ci
4243

43-
- uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
44+
- uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
4445

4546
- name: Build, test, and publish crossdock image
4647
run: bash scripts/build/build-crossdock.sh

‎.github/workflows/ci-docker-all-in-one.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Build all-in-one
22

33
on:
4+
merge_group:
45
push:
56
branches: [main]
67

@@ -24,7 +25,7 @@ jobs:
2425
jaeger_version: [v1, v2]
2526

2627
steps:
27-
- uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
28+
- uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
2829
with:
2930
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
3031

@@ -37,15 +38,15 @@ jobs:
3738

3839
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
3940
with:
40-
go-version: 1.23.x
41+
go-version: 1.24.x
4142

4243
- uses: ./.github/actions/setup-node.js
4344

4445
- uses: ./.github/actions/setup-branch
4546

4647
- run: make install-ci
4748

48-
- uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
49+
- uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
4950

5051
- name: Define BUILD_FLAGS var if running on a Pull Request
5152
run: |

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Build docker images
22

33
on:
4+
merge_group:
45
push:
56
branches: [main]
67

@@ -20,7 +21,7 @@ jobs:
2021
runs-on: ubuntu-latest
2122

2223
steps:
23-
- uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
24+
- uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
2425
with:
2526
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
2627

@@ -33,15 +34,15 @@ jobs:
3334

3435
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
3536
with:
36-
go-version: 1.23.x
37+
go-version: 1.24.x
3738

3839
- uses: ./.github/actions/setup-node.js
3940

4041
- uses: ./.github/actions/setup-branch
4142

4243
- run: make install-ci
4344

44-
- uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
45+
- uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
4546

4647
- name: Build only linux/amd64 container images for a Pull Request
4748
if: github.ref_name != 'main'

‎.github/workflows/ci-docker-hotrod.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: CIT Hotrod
22

33
on:
4+
merge_group:
45
push:
56
branches: [main]
67

@@ -25,7 +26,7 @@ jobs:
2526
jaeger-version: [v1, v2]
2627

2728
steps:
28-
- uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
29+
- uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
2930
with:
3031
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
3132

@@ -39,13 +40,13 @@ jobs:
3940
4041
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
4142
with:
42-
go-version: 1.23.x
43+
go-version: 1.24.x
4344

4445
- uses: ./.github/actions/setup-node.js
4546

4647
- uses: ./.github/actions/setup-branch
4748

48-
- uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
49+
- uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
4950

5051
- name: Define BUILD_FLAGS var if running on a Pull Request
5152
run: |

‎.github/workflows/ci-e2e-all.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: E2E Tests
22

33
on:
4+
merge_group:
45
push:
56
branches: [main]
67

‎.github/workflows/ci-e2e-badger.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
version: [v1, v2]
2121
steps:
2222
- name: Harden Runner
23-
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
23+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
2424
with:
2525
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
2626

2727
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2828
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2929
with:
30-
go-version: 1.23.x
30+
go-version: 1.24.x
3131

3232
- name: Run Badger storage integration tests
3333
run: |

‎.github/workflows/ci-e2e-cassandra.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ jobs:
3333
name: ${{ matrix.version.distribution }}-${{ matrix.version.major }} ${{ matrix.jaeger-version }} schema=${{ matrix.create-schema }}
3434
steps:
3535
- name: Harden Runner
36-
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
36+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
3737
with:
3838
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
3939

4040
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
4141

4242
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
4343
with:
44-
go-version: 1.23.x
44+
go-version: 1.24.x
4545

4646
- name: Run cassandra integration tests
4747
id: test-execution

‎.github/workflows/ci-e2e-elasticsearch.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
name: ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}
3434
steps:
3535
- name: Harden Runner
36-
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
36+
uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
3737
with:
3838
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
3939

@@ -43,14 +43,14 @@ jobs:
4343

4444
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
4545
with:
46-
go-version: 1.23.x
46+
go-version: 1.24.x
4747

4848
- name: time settings
4949
run: |
5050
date
5151
echo TZ="$TZ"
5252
53-
- uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
53+
- uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
5454
- name: Run ${{ matrix.version.distribution }} integration tests
5555
id: test-execution
5656
run: bash scripts/e2e/elasticsearch.sh ${{ matrix.version.distribution }} ${{ matrix.version.major }} ${{ matrix.version.jaeger }}

0 commit comments

Comments
 (0)