Skip to content

Commit

Permalink
Merge pull request #2082 from kushthedude/labelSort
Browse files Browse the repository at this point in the history
feat: seperate website build from meshery
  • Loading branch information
leecalcote committed Dec 15, 2020
2 parents 3402b15 + 42c4992 commit b1ca936
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 13 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ on:
branches:
- 'master'
paths-ignore:
- 'docs/**'
- 'docs/**'
pull_request:
branches:
- 'master'
paths-ignore:
- 'docs/**'
- 'docs/**'

jobs:
golangci:
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
${{ runner.os }}-go-
- run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go test -tags draft ./...
build-backend:
name: Backend build
Expand All @@ -70,7 +70,7 @@ jobs:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
${{ runner.os }}-go-
- run: |
go clean -modcache
rm go.sum
Expand Down Expand Up @@ -226,7 +226,7 @@ jobs:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
${{ runner.os }}-go-
- name: goreleaser WITHOUT tag
uses: goreleaser/goreleaser-action@v1
if: success() && startsWith(github.ref, 'refs/tags/') == false
Expand Down
40 changes: 40 additions & 0 deletions .github/workflows/documentation-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Meshery Docs
on:
push:
paths:
- 'docs/**'
branches:
- 'master'
tags:
- 'v*'

jobs:
build:
name: build
runs-on: macos-latest
strategy:
matrix:
ruby: '2.7.1'
steps:
- name: Check out code
uses: actions/checkout@v2
- name: Unshallow
run: git fetch --prune --unshallow
- name: Set up Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
- name: Setup Cache
uses: actions/cache@v2
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
${{ runner.os }}-gems-
- name: Bundle install
run: |
bundle config path vendor/bundle
bundle install --jobs 4 --retry 3
- name: Build jekyll bundle
run: |
bundle exec jekyll build --drafts
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Before contributing, please review the [Documentation Contribution Flow](https:/
```bash
$ make site
```
*Note: From the Makefile, this command is actually running `$ bundle exec jekyll serve --drafts --livereload`. There are two Jekyll configuration, `jekyll serve` for developing locally and `jekyll build` when you need to generate the site artefacts for production.*
*Note: From the Makefile, this command is actually running `$ bundle exec jekyll serve --drafts --livereload`. There are two Jekyll configuration, `jekyll serve` for developing locally and `jekyll build` when you need to generate the site artifacts for production.*

### 4. Create a Pull Request

Expand Down

This file was deleted.

This file was deleted.

0 comments on commit b1ca936

Please sign in to comment.