Skip to content

Commit 34aa087

Browse files
committed
Resolve merge conflicts - adapt to new directory structure
Signed-off-by: Aryan Shah <[email protected]>
2 parents 531e56a + ca6184d commit 34aa087

File tree

789 files changed

+873
-437
lines changed

Some content is hidden

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

789 files changed

+873
-437
lines changed

.github/build/Makefile.core.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,4 @@ PORT:=1313
6060
# Build
6161
#-----------------------------------------------------------------------------
6262
RELEASE_CHANNEL="edge"
63+
BASEURL:="https://layer5io.github.io/exoscale-academy"

.github/workflows/static.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# Simple workflow for deploying static content to GitHub Pages
2+
name: Deploy static content to Pages
3+
4+
on:
5+
# Runs on pushes targeting the default branch
6+
pull_request:
7+
branches: [ "master" ]
8+
9+
# Allows you to run this workflow manually from the Actions tab
10+
workflow_dispatch:
11+
12+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
13+
permissions:
14+
contents: read
15+
pages: write
16+
id-token: write
17+
pull-requests: write
18+
19+
concurrency:
20+
group: "pages-${{ github.event.pull_request.number || github.run_id }}"
21+
cancel-in-progress: true
22+
23+
jobs:
24+
# Single deploy job since we're just deploying
25+
deploy:
26+
environment:
27+
name: pr-preview-${{ github.event.pull_request.number || github.run_id }}
28+
url: ${{ steps.deployment.outputs.page_url }}
29+
runs-on: ubuntu-latest
30+
steps:
31+
- name: Checkout
32+
uses: actions/checkout@v4
33+
- name: Setup Pages
34+
uses: actions/configure-pages@v5
35+
- name: Setup Hugo (Extended)
36+
uses: peaceiris/actions-hugo@v2
37+
with:
38+
hugo-version: '0.147.9'
39+
extended: true
40+
- name: Install dependencies
41+
run: make setup
42+
- name: Build Academy
43+
run: make build-preview BASEURL=https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/pr-preview-${{ github.event.pull_request.number || github.run_id }}
44+
- name: Upload artifact
45+
uses: actions/upload-pages-artifact@v3
46+
with:
47+
# Upload just the public folder
48+
path: 'public'
49+
- name: Deploy to GitHub Pages
50+
id: deployment
51+
uses: actions/deploy-pages@v4
52+
- name: Comment Preview URL on PR
53+
if: github.event_name == 'pull_request'
54+
uses: marocchino/sticky-pull-request-comment@v2
55+
with:
56+
message: |
57+
🚀 **Preview deployment for PR #${{ github.event.pull_request.number }}**
58+
59+
🌐 PR URL: https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/pr-preview-${{ github.event.pull_request.number || github.run_id }}
60+
> 📖 General Preview: ${{ steps.deployment.outputs.page_url }}
61+
62+
This preview will be updated automatically when you push new commits to this PR.

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ site: check-go
3030
build:
3131
hugo build
3232

33+
## Build site for local consumption
34+
build-preview:
35+
hugo --baseURL=$(BASEURL)
36+
3337
## Empty build cache and run on your local machine.
3438
clean:
3539
hugo --cleanDestinationDir
@@ -50,4 +54,4 @@ theme-update:
5054
echo "Updating to latest academy-theme..." && \
5155
hugo mod get -u
5256

53-
.PHONY: setup build site clean site-fast check-go theme-update
57+
.PHONY: setup build site clean site-fast check-go theme-update

README.md

Lines changed: 1 addition & 1 deletion

content/learning-paths/98e16360-a366-4b78-8e0a-031da07fdacb/advanced-course/_index.md

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

content/learning-paths/98e16360-a366-4b78-8e0a-031da07fdacb/cka-prep/_index.md

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 10 additions & 0 deletions
Lines changed: 10 additions & 0 deletions
Lines changed: 1 addition & 0 deletions

0 commit comments

Comments
 (0)