Skip to content

Commit 2159b2c

Browse files
VincamineVincamine
authored
Merge branch 'master' into assessments-create
Signed-off-by: Wyllie Fang <149436095+Vincamine@users.noreply.github.com>
2 parents 6599550 + f151e2a commit 2159b2c

180 files changed

Lines changed: 5684 additions & 43 deletions

File tree

Some content is hidden

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

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ assignees: ''
2828

2929
---
3030
#### Contributor Guide and Resources
31-
- 📚 [Instructions for contributing to academy-example](https://github.com/layer5io/academy-example/blob/master/CONTRIBUTING.md)
32-
- academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
31+
- 📚 [Instructions for contributing to layer5-academy](https://github.com/layer5io/layer5-academy/blob/master/CONTRIBUTING.md)
32+
- academy-template documentation [site](https://docs.layer5.io/cloud/academy/), [example](https://github.com/layer5io/academy-example/) and [theme](https://github.com/layer5io/academy-theme/)
3333
- 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
3434
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

‎.github/ISSUE_TEMPLATE/ci.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ assignees: ''
1919

2020
---
2121
#### Contributor Guide and Resources
22-
- 📚 [Instructions for contributing to academy-example](https://github.com/layer5io/academy-example/blob/master/CONTRIBUTING.md)
23-
- academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
22+
- 📚 [Instructions for contributing to layer5-academy](https://github.com/layer5io/layer5-academy/blob/master/CONTRIBUTING.md)
23+
- academy-template documentation [site](https://docs.layer5.io/cloud/academy/), [example](https://github.com/layer5io/academy-example/) and [theme](https://github.com/layer5io/academy-theme/)
2424
- 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
25-
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)
25+
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
blank_issues_enabled: false
2+
contact_links:
3+
- name: 🙋🏾🙋🏼‍Question
4+
url: https://discuss.layer5.io
5+
about: Submit your question on the discussion forum.

‎.github/ISSUE_TEMPLATE/documentation.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ assignees: ''
1313

1414
---
1515
#### Contributor Guide and Resources
16-
- 📚 [Instructions for contributing to academy-example](https://github.com/layer5io/academy-example/blob/master/CONTRIBUTING.md)
17-
- academy-example documentation [site](https://docs.layer5.io/cloud/academy/) and [source](https://github.com/layer5io/academy-example/)
16+
- 📚 [Instructions for contributing to layer5-academy](https://github.com/layer5io/layer5-academy/blob/master/CONTRIBUTING.md)
17+
- academy-template documentation [site](https://docs.layer5.io/cloud/academy/), [example](https://github.com/layer5io/academy-example/) and [theme](https://github.com/layer5io/academy-theme/)
1818
- 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
1919
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: 💡 Feature Request
3-
about: Suggest an enhancement to Meshery.
3+
about: Suggest an enhancement to Layer5 Academy.
44
title: ''
55
labels: 'kind/enhancement'
66
assignees: ''
@@ -21,5 +21,8 @@ assignees: ''
2121
<!-- [Optional] Any visual diagrams of the desired user interface. -->
2222

2323
---
24-
**[Contributor Guide](https://github.com/layer5io/academy-example/blob/master/CONTRIBUTING.md)**
24+
#### Contributor Guide and Resources
25+
- 📚 [Instructions for contributing to layer5-academy](https://github.com/layer5io/layer5-academy/blob/master/CONTRIBUTING.md)
26+
- academy-template documentation [site](https://docs.layer5.io/cloud/academy/), [example](https://github.com/layer5io/academy-example/) and [theme](https://github.com/layer5io/academy-theme/)
2527
- 🎨 Wireframes and [designs for Layer5 site](https://www.figma.com/file/5ZwEkSJwUPitURD59YHMEN/Layer5-Designs) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
28+
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

‎.github/ISSUE_TEMPLATE/question.md‎

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

‎.github/workflows/static.yml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ concurrency:
2323
jobs:
2424
# Single deploy job since we're just deploying
2525
deploy:
26+
if: github.event.pull_request.head.repo.full_name != github.repository
27+
2628
environment:
2729
name: pr-preview-${{ github.event.pull_request.number || github.run_id }}
2830
url: ${{ steps.deployment.outputs.page_url }}
@@ -47,8 +49,39 @@ jobs:
4749
# Upload just the public folder
4850
path: 'public'
4951
- name: Deploy to GitHub Pages
52+
if: github.event.pull_request.head.repo.full_name == github.repository
5053
id: deployment
5154
uses: actions/deploy-pages@v4
55+
56+
57+
58+
59+
60+
61+
62+
- name: Commit changes
63+
if: github.event.pull_request.head.repo.full_name != github.repository
64+
uses: stefanzweifel/git-auto-commit-action@v5
65+
with:
66+
file_pattern: mesheryctl/helpers server/helpers/ **.go docs/
67+
commit_user_name: l5io
68+
commit_user_email: ci@meshery.io
69+
commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
70+
commit_options: "--signoff"
71+
commit_message: "Deployment preview for PR ${{ github.event.pull_request.number }}"
72+
73+
# - name: Set up Git user
74+
# if: github.event.pull_request.head.repo.full_name != github.repository
75+
# run: |
76+
# git config user.name "l5io"
77+
# git config user.email "l5io@users.noreply.github.com"
78+
# - name: Push branch to master repo
79+
# if: github.event.pull_request.head.repo.full_name != github.repository
80+
# run: |
81+
# git remote add main-origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
82+
# git push main-origin HEAD:refs/heads/pr-preview/${{ github.event.pull_request.number }} --force
83+
84+
5285
- name: Comment Preview URL on PR
5386
if: github.event_name == 'pull_request'
5487
uses: marocchino/sticky-pull-request-comment@v2
@@ -61,3 +94,24 @@ jobs:
6194
> 📖 General Preview: ${{ steps.deployment.outputs.page_url }}
6295
6396
This preview will be updated automatically when you push new commits to this PR.
97+
98+
99+
100+
101+
102+
103+
104+
105+
106+
# mirror-fork-pr:
107+
# if: github.event.pull_request.head.repo.full_name != github.repository
108+
# environment:
109+
# name: pr-preview-${{ github.event.pull_request.number || github.run_id }}
110+
# # url: ${{ steps.deployment.outputs.page_url }}
111+
# runs-on: ubuntu-latest
112+
# steps:
113+
# - name: Checkout PR branch
114+
# uses: actions/checkout@v4
115+
# with:
116+
# ref: ${{ github.event.pull_request.head.ref }}
117+
# repository: ${{ github.event.pull_request.head.repo.full_name }}

‎content/_index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ title: Academy
1010
Welcome to dev environment for your Academy
1111

1212

13-
[LearningPaths](/academy/learning-paths/)
13+
[Learning Paths](/academy/learning-paths/)
1414

1515
[Challenges](/academy/challenges/)
1616

‎content/challenges/11111111-1111-1111-1111-111111111111/how-to -add-volumes-to-kubernetes-clusters/_index.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
title: "How to Add Volumes to Kubernetes Clusters"
3+
description: "Test your Kubernetes expertise with this CNCF Challenge! Demonstrate your ability to configure and manage persistent storage in DigitalOcean Kubernetes (DOKS) by creating PersistentVolumeClaims (PVCs), setting up StatefulSets, and troubleshooting volume issues."
4+
banner: "images/digitalocean.svg"
5+
id: "79ef4658-bc1d-47xx-9e8e-dea864d5590d"
6+
---

0 commit comments

Comments
 (0)