Skip to content
This repository was archived by the owner on Feb 23, 2022. It is now read-only.

Commit 2d5a4a3

Browse files
authored
Merge pull request #20 from travisn/backport-master
Backport: Storage provider refactor including latest build scripts and docs to the release-1.7 branch
2 parents 062f1ca + f030f64 commit 2d5a4a3

File tree

936 files changed

+960
-164221
lines changed

Some content is hidden

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

936 files changed

+960
-164221
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Resolves #
1010
**Checklist:**
1111

1212
- [ ] **Commit Message Formatting**: Commit titles and messages follow guidelines in the [developer guide](https://rook.io/docs/rook/master/development-flow.html#commit-structure).
13-
- [ ] **Skip Tests for Docs**: Add the flag for skipping the build if this is only a documentation change. See [here](https://github.com/rook/rook/blob/master/INSTALL.md#skip-ci) for the flag.
14-
- [ ] **Skip Unrelated Tests**: Add a flag to run tests for a specific storage provider. See [test options](https://github.com/rook/rook/blob/master/INSTALL.md#test-storage-provider).
13+
- [ ] **Skip Tests for Docs**: Add the flag for skipping the build if this is only a documentation change. See [here](https://github.com/rook/cassandra/blob/master/INSTALL.md#skip-ci) for the flag.
14+
- [ ] **Skip Unrelated Tests**: Add a flag to run tests for a specific storage provider. See [test options](https://github.com/rook/cassandra/blob/master/INSTALL.md#test-storage-provider).
1515
- [ ] Reviewed the developer guide on [Submitting a Pull Request](https://rook.io/docs/rook/master/development-flow.html#submitting-a-pull-request)
1616
- [ ] Documentation has been updated, if necessary.
1717
- [ ] Unit tests have been added, if necessary.

.github/workflows/build.yml

Lines changed: 10 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -8,75 +8,33 @@ defaults:
88
shell: bash --noprofile --norc -eo pipefail -x {0}
99

1010
jobs:
11-
macos-build:
12-
runs-on: macos-10.15
13-
steps:
14-
- name: checkout
15-
uses: actions/checkout@v2
16-
with:
17-
fetch-depth: 0
18-
19-
- uses: actions/setup-go@v2
20-
with:
21-
go-version: 1.16
22-
23-
- name: copy working directory to GOPATH
24-
run: sudo mkdir -p /Users/runner/go/src/github.com && sudo cp -a /Users/runner/work/rook /Users/runner/go/src/github.com/
25-
26-
- name: build rook
27-
working-directory: /Users/runner/go/src/github.com/rook/rook
28-
run: |
29-
GOPATH=$(go env GOPATH) make clean && make -j$nproc IMAGES='ceph' BUILD_CONTAINER_IMAGE=false build
30-
31-
- name: run codegen
32-
working-directory: /Users/runner/go/src/github.com/rook/rook
33-
run: GOPATH=$(go env GOPATH) make codegen
34-
35-
- name: validate codegen
36-
working-directory: /Users/runner/go/src/github.com/rook/rook
37-
run: tests/scripts/validate_modified_files.sh codegen
38-
39-
- name: run mod check
40-
run: GOPATH=$(go env GOPATH) make -j $(nproc) mod.check
41-
42-
- name: validate modcheck
43-
run: tests/scripts/validate_modified_files.sh modcheck
44-
45-
- name: run crds-gen
46-
working-directory: /Users/runner/go/src/github.com/rook/rook
47-
run: make csv-clean && GOPATH=$(go env GOPATH) make crds
48-
49-
- name: validate crds-gen
50-
working-directory: /Users/runner/go/src/github.com/rook/rook
51-
run: tests/scripts/validate_modified_files.sh crd
52-
53-
- name: setup tmate session for debugging
54-
if: failure()
55-
uses: mxschmitt/action-tmate@v3
56-
timeout-minutes: 120
57-
5811
linux-build-all:
5912
runs-on: ubuntu-18.04
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
go-version : ['1.16', '1.17']
6017
steps:
6118
- name: checkout
6219
uses: actions/checkout@v2
6320
with:
6421
fetch-depth: 0
6522

66-
- name: setup golang
23+
- name: setup golang ${{ matrix.go-version }}
6724
uses: actions/setup-go@v2
6825
with:
69-
go-version: 1.16
26+
go-version: ${{ matrix.go-version }}
7027

7128
- name: set up QEMU
7229
uses: docker/setup-qemu-action@master
7330
with:
7431
platforms: all
7532

76-
- name: build.all rook
77-
run: tests/scripts/github-action-helper.sh build_rook_all
33+
- name: build.all rook with go ${{ matrix.go-version }}
34+
run: |
35+
tests/scripts/github-action-helper.sh build_rook_all
7836
7937
- name: setup tmate session for debugging
8038
if: failure()
8139
uses: mxschmitt/action-tmate@v3
82-
timeout-minutes: 120
40+
timeout-minutes: 60

.github/workflows/canary-integration-test-arm64.yml

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)