Skip to content

Commit b460f59

Browse files
Cherry-pick of #9054 to release/v23.1 branch (#9069)
Cherry picking #9054 from main to get following updates: - Actions versions update - adding WarpBuild runners for execution without concurrency limits - tuning triggers/schedules --------- Co-authored-by: Ryan Fox-Tyler <[email protected]>
1 parent 2b18d19 commit b460f59

14 files changed

+82
-101
lines changed

.github/workflows/cd-dgraph.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ on:
1212
type: string
1313
jobs:
1414
dgraph-build-amd64:
15-
runs-on: ubuntu-20.04
15+
runs-on: warp-ubuntu-latest-x64-16x
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
with:
1919
ref: '${{ github.event.inputs.releasetag }}'
2020
- name: Get Go Version
@@ -23,7 +23,7 @@ jobs:
2323
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
2424
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
2525
- name: Set up Go
26-
uses: actions/setup-go@v3
26+
uses: actions/setup-go@v5
2727
with:
2828
go-version: ${{ env.GOVERSION }}
2929
- name: Install protobuf-compiler
@@ -100,9 +100,9 @@ jobs:
100100
docker push dgraph/dgraph:${{ env.DGRAPH_RELEASE_VERSION }}-amd64
101101
102102
dgraph-build-arm64:
103-
runs-on: [self-hosted, arm64]
103+
runs-on: warp-ubuntu-latest-arm64-16x
104104
steps:
105-
- uses: actions/checkout@v3
105+
- uses: actions/checkout@v4
106106
with:
107107
ref: '${{ github.event.inputs.releasetag }}'
108108
- name: Get Go Version
@@ -111,7 +111,7 @@ jobs:
111111
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
112112
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
113113
- name: Set up Go
114-
uses: actions/setup-go@v3
114+
uses: actions/setup-go@v5
115115
with:
116116
go-version: ${{ env.GOVERSION }}
117117
- name: Install protobuf-compiler
@@ -189,9 +189,9 @@ jobs:
189189
190190
dgraph-docker-manifest:
191191
needs: [dgraph-build-amd64, dgraph-build-arm64]
192-
runs-on: ubuntu-20.04
192+
runs-on: warp-ubuntu-latest-x64-16x
193193
steps:
194-
- uses: actions/checkout@v3
194+
- uses: actions/checkout@v4
195195
with:
196196
ref: '${{ github.event.inputs.releasetag }}'
197197
- name: Set Dgraph Release Version

.github/workflows/ci-aqua-security-trivy-tests.yml

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: ci-aqua-security-trivy-tests
22
on:
3-
push:
3+
pull_request:
44
paths-ignore:
55
- '.github/CODEOWNERS'
66
- '.vscode/**'
@@ -19,10 +19,6 @@ on:
1919
- '**/**.jpg'
2020
- '**/**.gif'
2121
- '**/**.ini'
22-
branches:
23-
- main
24-
- 'release/**'
25-
pull_request:
2622
types:
2723
- opened
2824
- reopened
@@ -37,17 +33,17 @@ jobs:
3733
build:
3834
name: trivy-tests
3935
if: github.event.pull_request.draft == false
40-
runs-on: ubuntu-20.04
36+
runs-on: warp-ubuntu-latest-x64-4x
4137
steps:
4238
- name: Checkout code
43-
uses: actions/checkout@v3
39+
uses: actions/checkout@v4
4440
- name: Get Go Version
4541
run: |
4642
#!/bin/bash
4743
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
4844
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
4945
- name: Set up Go
50-
uses: actions/setup-go@v3
46+
uses: actions/setup-go@v5
5147
with:
5248
go-version: ${{ env.GOVERSION }}
5349
- name: Build Docker image
@@ -60,6 +56,6 @@ jobs:
6056
format: 'sarif'
6157
output: 'trivy-results.sarif'
6258
- name: Upload Trivy scan results to GitHub Security tab
63-
uses: github/codeql-action/upload-sarif@v2
59+
uses: github/codeql-action/upload-sarif@v3
6460
with:
6561
sarif_file: 'trivy-results.sarif'

.github/workflows/ci-dgraph-code-coverage.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,16 @@ on:
2424
- 'release/**'
2525
jobs:
2626
dgraph-code-coverage:
27-
runs-on: [self-hosted, x64]
28-
# runs-on: ubuntu-20.04
27+
runs-on: warp-ubuntu-latest-x64-16x
2928
steps:
30-
- uses: actions/checkout@v3 # defaults to SHA of event that triggered workflow
29+
- uses: actions/checkout@v4 # defaults to SHA of event that triggered workflow
3130
- name: Get Go Version
3231
run: |
3332
#!/bin/bash
3433
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
3534
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
3635
- name: Set up Go
37-
uses: actions/setup-go@v3
36+
uses: actions/setup-go@v5
3837
with:
3938
go-version: ${{ env.GOVERSION }}
4039
- name: Set up Node

.github/workflows/ci-dgraph-fuzz.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
name: ci-dgraph-fuzz
22
on:
3-
push:
4-
branches:
5-
- main
6-
- 'release/**'
73
pull_request:
84
types:
95
- opened
@@ -17,16 +13,16 @@ on:
1713
- cron: "1 */8 * * *" # every 8hrs
1814
jobs:
1915
fuzz-test:
20-
runs-on: ubuntu-20.04
16+
runs-on: warp-ubuntu-latest-x64-4x
2117
steps:
22-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
2319
- name: Get Go Version
2420
run: |
2521
#!/bin/bash
2622
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
2723
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
2824
- name: Set up Go
29-
uses: actions/setup-go@v3
25+
uses: actions/setup-go@v5
3026
with:
3127
go-version: ${{ env.GOVERSION }}
3228
- name: Run fuzz tests

.github/workflows/ci-dgraph-integration2-tests.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
name: ci-dgraph-integration2-tests
22
on:
3-
push:
4-
branches:
5-
- main
6-
- 'release/**'
73
pull_request:
84
types:
95
- opened
@@ -18,9 +14,9 @@ on:
1814
jobs:
1915
dgraph-integration2-tests:
2016
if: github.event.pull_request.draft == false
21-
runs-on: ubuntu-20.04
17+
runs-on: warp-ubuntu-latest-x64-4x
2218
steps:
23-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2420
with:
2521
fetch-depth: 0
2622
- name: Get Go Version
@@ -29,7 +25,7 @@ jobs:
2925
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
3026
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
3127
- name: Set up Go
32-
uses: actions/setup-go@v3
28+
uses: actions/setup-go@v5
3329
with:
3430
go-version: ${{ env.GOVERSION }}
3531
- name: Make Linux Build and Docker Image

.github/workflows/ci-dgraph-ldbc-tests.yml

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: ci-dgraph-ldbc-tests
22
on:
3-
push:
3+
pull_request:
44
paths-ignore:
55
- '.github/CODEOWNERS'
66
- '.vscode/**'
@@ -19,10 +19,6 @@ on:
1919
- '**/**.jpg'
2020
- '**/**.gif'
2121
- '**/**.ini'
22-
branches:
23-
- main
24-
- 'release/**'
25-
pull_request:
2622
types:
2723
- opened
2824
- reopened
@@ -36,21 +32,21 @@ on:
3632
jobs:
3733
dgraph-ldbc-tests:
3834
if: github.event.pull_request.draft == false
39-
runs-on: ubuntu-20.04
35+
runs-on: warp-ubuntu-latest-x64-4x
4036
steps:
4137
- name: Checkout Dgraph
42-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
4339
- name: Get Go Version
4440
run: |
4541
#!/bin/bash
4642
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
4743
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
4844
- name: Set up Go
49-
uses: actions/setup-go@v3
45+
uses: actions/setup-go@v5
5046
with:
5147
go-version: ${{ env.GOVERSION }}
5248
- name: Set up Node
53-
uses: actions/setup-node@v3
49+
uses: actions/setup-node@v4
5450
with:
5551
node-version: 16
5652
- name: Install protobuf-compiler

.github/workflows/ci-dgraph-load-tests.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ on:
3636
jobs:
3737
dgraph-load-tests:
3838
if: github.event.pull_request.draft == false
39-
runs-on: [self-hosted, x64]
39+
runs-on: warp-ubuntu-latest-x64-16x
4040
steps:
41-
- uses: actions/checkout@v3
41+
- uses: actions/checkout@v4
4242
- name: Get Go Version
4343
run: |
4444
#!/bin/bash
4545
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
4646
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
4747
- name: Set up Go
48-
uses: actions/setup-go@v3
48+
uses: actions/setup-go@v5
4949
with:
5050
go-version: ${{ env.GOVERSION }}
5151
- name: Set up Node
52-
uses: actions/setup-node@v3
52+
uses: actions/setup-node@v4
5353
with:
5454
node-version: 16
5555
- name: Install protobuf-compiler

.github/workflows/ci-dgraph-oss-build.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: ci-dgraph-oss-build
22
on:
3-
push:
3+
pull_request:
44
paths-ignore:
55
- '.github/CODEOWNERS'
66
- '.vscode/**'
@@ -19,10 +19,6 @@ on:
1919
- '**/**.jpg'
2020
- '**/**.gif'
2121
- '**/**.ini'
22-
branches:
23-
- main
24-
- 'release/**'
25-
pull_request:
2622
types:
2723
- opened
2824
- reopened
@@ -36,16 +32,16 @@ on:
3632
jobs:
3733
dgraph-oss-build:
3834
if: github.event.pull_request.draft == false
39-
runs-on: ubuntu-20.04
35+
runs-on: warp-ubuntu-latest-x64-4x
4036
steps:
41-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
4238
- name: Get Go Version
4339
run: |
4440
#!/bin/bash
4541
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
4642
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
4743
- name: Set up Go
48-
uses: actions/setup-go@v3
44+
uses: actions/setup-go@v5
4945
with:
5046
go-version: ${{ env.GOVERSION }}
5147
- name: Make OSS Linux Build

.github/workflows/ci-dgraph-tests-arm64.yml

+29-22
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
11
name: ci-dgraph-tests-arm64
22
on:
3-
push:
3+
pull_request:
44
paths-ignore:
5-
- '.github/CODEOWNERS'
6-
- '.vscode/**'
7-
- 'compose/**'
8-
- 'contrib/systemd/**'
9-
- 'licenses/**'
10-
- 'paper/**'
11-
- 'present/**'
12-
- 'RFC/**'
13-
- 'static/**'
14-
- 'wiki/**'
15-
- '**/**.dockerignore'
16-
- '**/**.gitignore'
17-
- '**/**.md'
18-
- '**/**.png'
19-
- '**/**.jpg'
20-
- '**/**.gif'
21-
- '**/**.ini'
5+
- '.github/CODEOWNERS'
6+
- '.vscode/**'
7+
- 'compose/**'
8+
- 'contrib/systemd/**'
9+
- 'licenses/**'
10+
- 'paper/**'
11+
- 'present/**'
12+
- 'RFC/**'
13+
- 'static/**'
14+
- 'wiki/**'
15+
- '**/**.dockerignore'
16+
- '**/**.gitignore'
17+
- '**/**.md'
18+
- '**/**.png'
19+
- '**/**.jpg'
20+
- '**/**.gif'
21+
- '**/**.ini'
22+
types:
23+
- opened
24+
- reopened
25+
- synchronize
26+
- ready_for_review
2227
branches:
2328
- main
2429
- 'release/**'
@@ -33,23 +38,25 @@ on:
3338
- 'release/**'
3439
schedule:
3540
- cron: "1 0,6,12,18 * * *"
41+
- main
42+
- 'release/**'
3643
jobs:
3744
dgraph-tests:
3845
if: github.event.pull_request.draft == false
39-
runs-on: [self-hosted, ARM64]
46+
runs-on: warp-ubuntu-latest-arm64-16x
4047
steps:
41-
- uses: actions/checkout@v3
48+
- uses: actions/checkout@v4
4249
- name: Get Go Version
4350
run: |
4451
#!/bin/bash
4552
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
4653
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
4754
- name: Set up Go
48-
uses: actions/setup-go@v3
55+
uses: actions/setup-go@v5
4956
with:
5057
go-version: ${{ env.GOVERSION }}
5158
- name: Set up Node
52-
uses: actions/setup-node@v3
59+
uses: actions/setup-node@v4
5360
with:
5461
node-version: 16
5562
- name: Install protobuf-compiler

0 commit comments

Comments
 (0)