Skip to content

Commit

Permalink
Cherry-pick of #9054 to release/v23.1 branch (#9069)
Browse files Browse the repository at this point in the history
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 <60440289+ryanfoxtyler@users.noreply.github.com>
  • Loading branch information
meghalims and ryanfoxtyler authored Apr 10, 2024
1 parent 2b18d19 commit b460f59
Show file tree
Hide file tree
Showing 14 changed files with 82 additions and 101 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/cd-dgraph.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ on:
type: string
jobs:
dgraph-build-amd64:
runs-on: ubuntu-20.04
runs-on: warp-ubuntu-latest-x64-16x
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: '${{ github.event.inputs.releasetag }}'
- name: Get Go Version
Expand All @@ -23,7 +23,7 @@ jobs:
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: ${{ env.GOVERSION }}
- name: Install protobuf-compiler
Expand Down Expand Up @@ -100,9 +100,9 @@ jobs:
docker push dgraph/dgraph:${{ env.DGRAPH_RELEASE_VERSION }}-amd64
dgraph-build-arm64:
runs-on: [self-hosted, arm64]
runs-on: warp-ubuntu-latest-arm64-16x
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: '${{ github.event.inputs.releasetag }}'
- name: Get Go Version
Expand All @@ -111,7 +111,7 @@ jobs:
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: ${{ env.GOVERSION }}
- name: Install protobuf-compiler
Expand Down Expand Up @@ -189,9 +189,9 @@ jobs:
dgraph-docker-manifest:
needs: [dgraph-build-amd64, dgraph-build-arm64]
runs-on: ubuntu-20.04
runs-on: warp-ubuntu-latest-x64-16x
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: '${{ github.event.inputs.releasetag }}'
- name: Set Dgraph Release Version
Expand Down
14 changes: 5 additions & 9 deletions .github/workflows/ci-aqua-security-trivy-tests.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: ci-aqua-security-trivy-tests
on:
push:
pull_request:
paths-ignore:
- '.github/CODEOWNERS'
- '.vscode/**'
Expand All @@ -19,10 +19,6 @@ on:
- '**/**.jpg'
- '**/**.gif'
- '**/**.ini'
branches:
- main
- 'release/**'
pull_request:
types:
- opened
- reopened
Expand All @@ -37,17 +33,17 @@ jobs:
build:
name: trivy-tests
if: github.event.pull_request.draft == false
runs-on: ubuntu-20.04
runs-on: warp-ubuntu-latest-x64-4x
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Get Go Version
run: |
#!/bin/bash
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: ${{ env.GOVERSION }}
- name: Build Docker image
Expand All @@ -60,6 +56,6 @@ jobs:
format: 'sarif'
output: 'trivy-results.sarif'
- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: 'trivy-results.sarif'
7 changes: 3 additions & 4 deletions .github/workflows/ci-dgraph-code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,16 @@ on:
- 'release/**'
jobs:
dgraph-code-coverage:
runs-on: [self-hosted, x64]
# runs-on: ubuntu-20.04
runs-on: warp-ubuntu-latest-x64-16x
steps:
- uses: actions/checkout@v3 # defaults to SHA of event that triggered workflow
- uses: actions/checkout@v4 # defaults to SHA of event that triggered workflow
- name: Get Go Version
run: |
#!/bin/bash
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: ${{ env.GOVERSION }}
- name: Set up Node
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/ci-dgraph-fuzz.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
name: ci-dgraph-fuzz
on:
push:
branches:
- main
- 'release/**'
pull_request:
types:
- opened
Expand All @@ -17,16 +13,16 @@ on:
- cron: "1 */8 * * *" # every 8hrs
jobs:
fuzz-test:
runs-on: ubuntu-20.04
runs-on: warp-ubuntu-latest-x64-4x
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get Go Version
run: |
#!/bin/bash
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: ${{ env.GOVERSION }}
- name: Run fuzz tests
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/ci-dgraph-integration2-tests.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
name: ci-dgraph-integration2-tests
on:
push:
branches:
- main
- 'release/**'
pull_request:
types:
- opened
Expand All @@ -18,9 +14,9 @@ on:
jobs:
dgraph-integration2-tests:
if: github.event.pull_request.draft == false
runs-on: ubuntu-20.04
runs-on: warp-ubuntu-latest-x64-4x
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Get Go Version
Expand All @@ -29,7 +25,7 @@ jobs:
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: ${{ env.GOVERSION }}
- name: Make Linux Build and Docker Image
Expand Down
14 changes: 5 additions & 9 deletions .github/workflows/ci-dgraph-ldbc-tests.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: ci-dgraph-ldbc-tests
on:
push:
pull_request:
paths-ignore:
- '.github/CODEOWNERS'
- '.vscode/**'
Expand All @@ -19,10 +19,6 @@ on:
- '**/**.jpg'
- '**/**.gif'
- '**/**.ini'
branches:
- main
- 'release/**'
pull_request:
types:
- opened
- reopened
Expand All @@ -36,21 +32,21 @@ on:
jobs:
dgraph-ldbc-tests:
if: github.event.pull_request.draft == false
runs-on: ubuntu-20.04
runs-on: warp-ubuntu-latest-x64-4x
steps:
- name: Checkout Dgraph
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Get Go Version
run: |
#!/bin/bash
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: ${{ env.GOVERSION }}
- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
- name: Install protobuf-compiler
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-dgraph-load-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,20 @@ on:
jobs:
dgraph-load-tests:
if: github.event.pull_request.draft == false
runs-on: [self-hosted, x64]
runs-on: warp-ubuntu-latest-x64-16x
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get Go Version
run: |
#!/bin/bash
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: ${{ env.GOVERSION }}
- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
- name: Install protobuf-compiler
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/ci-dgraph-oss-build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: ci-dgraph-oss-build
on:
push:
pull_request:
paths-ignore:
- '.github/CODEOWNERS'
- '.vscode/**'
Expand All @@ -19,10 +19,6 @@ on:
- '**/**.jpg'
- '**/**.gif'
- '**/**.ini'
branches:
- main
- 'release/**'
pull_request:
types:
- opened
- reopened
Expand All @@ -36,16 +32,16 @@ on:
jobs:
dgraph-oss-build:
if: github.event.pull_request.draft == false
runs-on: ubuntu-20.04
runs-on: warp-ubuntu-latest-x64-4x
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get Go Version
run: |
#!/bin/bash
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: ${{ env.GOVERSION }}
- name: Make OSS Linux Build
Expand Down
51 changes: 29 additions & 22 deletions .github/workflows/ci-dgraph-tests-arm64.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
name: ci-dgraph-tests-arm64
on:
push:
pull_request:
paths-ignore:
- '.github/CODEOWNERS'
- '.vscode/**'
- 'compose/**'
- 'contrib/systemd/**'
- 'licenses/**'
- 'paper/**'
- 'present/**'
- 'RFC/**'
- 'static/**'
- 'wiki/**'
- '**/**.dockerignore'
- '**/**.gitignore'
- '**/**.md'
- '**/**.png'
- '**/**.jpg'
- '**/**.gif'
- '**/**.ini'
- '.github/CODEOWNERS'
- '.vscode/**'
- 'compose/**'
- 'contrib/systemd/**'
- 'licenses/**'
- 'paper/**'
- 'present/**'
- 'RFC/**'
- 'static/**'
- 'wiki/**'
- '**/**.dockerignore'
- '**/**.gitignore'
- '**/**.md'
- '**/**.png'
- '**/**.jpg'
- '**/**.gif'
- '**/**.ini'
types:
- opened
- reopened
- synchronize
- ready_for_review
branches:
- main
- 'release/**'
Expand All @@ -33,23 +38,25 @@ on:
- 'release/**'
schedule:
- cron: "1 0,6,12,18 * * *"
- main
- 'release/**'
jobs:
dgraph-tests:
if: github.event.pull_request.draft == false
runs-on: [self-hosted, ARM64]
runs-on: warp-ubuntu-latest-arm64-16x
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get Go Version
run: |
#!/bin/bash
GOVERSION=$({ [ -f .go-version ] && cat .go-version; })
echo "GOVERSION=$GOVERSION" >> $GITHUB_ENV
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: ${{ env.GOVERSION }}
- name: Set up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
- name: Install protobuf-compiler
Expand Down
Loading

0 comments on commit b460f59

Please sign in to comment.