Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/create-pr-for-plugin-docs/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ runs:
- --title
- "chore: regenerated plugin docs"
- --body
- "Created by this action run: https://github.com/jenkins-x/jx-docs/actions/runs/${{ inputs.run_id }}"
- "Created by this action run: https://github.com/jayex-io/jx-docs/actions/runs/${{ inputs.run_id }}"
- --label
- updatebot
- --label
Expand Down
28 changes: 9 additions & 19 deletions .lighthouse/jenkins-x/preview.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,41 +24,31 @@ spec:
- image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream
name: ""
resources: {}
- image: klakegg/hugo:0.101.0-ext-alpine
name: git-submodules
script: |
git config --global --add safe.directory /workspace/source
git submodule update --init --recursive

- image: klakegg/hugo:0.101.0-ext-alpine
name: update-content
command:
- ./scripts/ci/update-content.sh

- image: gcr.io/cloud-builders/npm
name: install-dependencies
command:
- npm
args:
- install

- image: klakegg/hugo:0.101.0-ext-alpine
- image: ghcr.io/gohugoio/hugo:v0.164.0
env:
- name: HUGO_GH_ACCESS_TOKEN
valueFrom:
secretKeyRef:
key: password
name: tekton-git
name: build-website
securityContext:
# TODO: make /tekton/home/ writable instead
runAsUser: 0
resources:
requests:
cpu: 400m
memory: 512Mi
script: |
#!/bin/sh
set -ex
git config --global --add safe.directory /workspace/source
git submodule update --init --recursive
./scripts/ci/update-content.sh
hugo mod npm pack
npm install
hugo -d tmp-website --enableGitInfo --baseURL https://${REPO_NAME}-jx-${REPO_OWNER}-${REPO_NAME}-pr-${PULL_NUMBER}.${DOMAIN}/

- image: ghcr.io/jenkins-x/jx-boot:3.2.197
name: jx-variables
resources: {}
Expand Down
30 changes: 10 additions & 20 deletions .lighthouse/jenkins-x/pullrequest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,11 @@ spec:
- image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone-pr.yaml@versionStream
name: ""
resources: {}
- image: klakegg/hugo:0.101.0-ext-alpine
name: git-submodules
command:
- git
args:
- submodule
- update
- --init
- --recursive
- image: klakegg/hugo:0.101.0-ext-alpine
name: update-content
command:
- ./scripts/ci/update-content.sh
- image: gcr.io/cloud-builders/npm
name: install-dependencies
command:
- npm
args:
- install
- image: klakegg/hugo:0.101.0-ext-alpine
- image: ghcr.io/gohugoio/hugo:v0.164.0
name: build-website
securityContext:
# TODO: make /tekton/home/ writable instead
runAsUser: 0
env:
- name: HUGO_GH_ACCESS_TOKEN
valueFrom:
Expand All @@ -58,6 +42,12 @@ spec:
memory: 512Mi
script: |
#!/bin/sh
set -ex
git config --global --add safe.directory /workspace/source
git submodule update --init --recursive
./scripts/ci/update-content.sh
hugo mod npm pack
npm install
hugo -d tmp-website --enableGitInfo --baseURL https://${REPO_NAME}-jx-${REPO_OWNER}-${REPO_NAME}-pr-${PULL_NUMBER}.${DOMAIN}/
- image: 18fgsa/html-proofer:latest
name: htmlproofer
Expand Down
65 changes: 17 additions & 48 deletions .lighthouse/jenkins-x/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,61 +31,30 @@ spec:
- image: uses:jenkins-x/jx3-pipeline-catalog/tasks/git-clone/git-clone.yaml@versionStream
name: ""
resources: {}
- image: klakegg/hugo:0.101.0-ext-alpine
name: git-clone-website
command:
- git
args:
- clone
- https://github.com/jayex-io/website.git
- --depth=20
- image: klakegg/hugo:0.101.0-ext-alpine
name: git-submodules
command:
- git
args:
- submodule
- update
- --init
- --recursive
- image: klakegg/hugo:0.101.0-ext-alpine
name: update-content
command:
- ./scripts/ci/update-content.sh
- image: gcr.io/cloud-builders/npm
name: install-dependencies
command:
- npm
args:
- install
## delete everything in the website repo clone
- image: klakegg/hugo:0.101.0-ext-alpine
name: remove-old
command:
- git
args:
- -C
- website
- rm
- -r
- "*"
## build the site into the cloned folder
- image: klakegg/hugo:0.101.0-ext-alpine
- image: ghcr.io/gohugoio/hugo:v0.164.0
name: build-website
securityContext:
# TODO: make /tekton/home/ writable instead
runAsUser: 0
env:
- name: HUGO_GH_ACCESS_TOKEN
valueFrom:
secretKeyRef:
key: password
name: tekton-git
command:
- hugo
args:
- -d
- website
- --enableGitInfo
- --baseURL
- https://jayex.io
script: |
#!/bin/sh
set -ex
git config --global --add safe.directory /workspace/source
git submodule update --init --recursive
./scripts/ci/update-content.sh
hugo mod npm pack
npm install
git clone https://github.com/jayex-io/website.git --depth=20
# delete everything in the website repo clone
git -C website rm -r "*"
# build the site into the cloned folder
hugo -d website --enableGitInfo --baseURL https://${REPO_NAME}-jx-${REPO_OWNER}-${REPO_NAME}-pr-${PULL_NUMBER}.${DOMAIN}/
resources:
requests:
cpu: 400m
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ npm install

<a id="markdown-running-hugo" name="running-hugo"></a>

The site itself is built with [Hugo](https://gohugo.io/) and configured in [`config.toml`](./config.toml).
The site itself is built with [Hugo](https://gohugo.io/) and configured in [`hugo.toml`](hugo.toml).
You have two options to run Hugo, either directly on your machine or via [Docker Compose](https://github.com/docker/compose).
The following two sections describe the two alternatives in more detail.

Expand Down
24 changes: 24 additions & 0 deletions assets/icons/cd.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 51 additions & 0 deletions assets/icons/jayex.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading