Merge branch 'main' of github.com:Anthilla/AnthC

# Conflicts: # docs/package.json
Anthilla · Jun 25, 2024 · 568872e · 568872e
2 parents 8c2bd65 + f94fd5b
commit 568872e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 17 deletions.
diff --git a/.github/workflows/hugo.yml b/.github/workflows/hugo.yml
@@ -32,29 +32,41 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      HUGO_VERSION: 0.124.1
+      HUGO_VERSION: 0.128.0
     steps:
       - name: Install Hugo CLI
         run: |
           wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \
-          && sudo dpkg -i ${{ runner.temp }}/hugo.deb
+          && sudo dpkg -i ${{ runner.temp }}/hugo.deb  
+          
       - name: Install Dart Sass
         run: sudo snap install dart-sass
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '20'  # Choose the Node.js version you need
+
+      - name: Install Node.js dependencies
+        run: |
+          #npm install -g postcss-cli autoprefixer
+          npm install postcss -D
+          npm install -g postcss-cli
+          npm install -g autoprefixer
+        
       - name: Checkout
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Setup Node environment
-        uses: actions/setup-node@v2
-         with:
-         node-version: '14'  # Specify the Node.js version you need
+          fetch-depth: 0
+
       - name: Setup Pages
         id: pages
-        uses: actions/configure-pages@v5
+        uses: actions/configure-pages@v4
+
       - name: Install Node.js dependencies
         run: "[[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true"
-      - name: Install PostCSS CLI
-        run: npm install -g postcss-cli
+
       - name: Build with Hugo
         env:
           # For maximum backward compatibility with Hugo modules
@@ -64,10 +76,11 @@ jobs:
           hugo \
             --gc \
             --minify \
-            --baseURL "${{ steps.pages.outputs.base_url }}/" 
+            --baseURL "${{ steps.pages.outputs.base_url }}/" \
             -s docs
+            
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v2
         with:
           path: ./public
 
@@ -81,4 +94,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v3
diff --git a/docs/package.json b/docs/package.json
@@ -1,13 +1,13 @@
 {
-  "name": "docsy-example-site",
-  "version": "0.10.0",
+  "name": "AnthC",
+  "version": "0.1.0",
   "version.next": "0.10.1-dev.0-unreleased",
-  "description": "Example site that uses Docsy theme for technical documentation.",
-  "repository": "github:google/docsy-example",
+  "description": "Documentation for the Anthilla Controller Board.",
+  "repository": "https://github.com/Anthilla/AnthC",
   "homepage": "https://example.docsy.dev",
   "author": "Docsy Authors",
   "license": "Apache-2.0",
-  "bugs": "https://github.com/google/docsy-example/issues",
+  "bugs": "-",
   "spelling": "cSpell:ignore HTMLTEST precheck postbuild -",
   "scripts": {
     "_build": "npm run _hugo-dev --",
@@ -33,7 +33,11 @@
     "update:pkg:dep": "npm install --save-dev autoprefixer@latest postcss-cli@latest",
     "update:pkg:hugo": "npm install --save-dev --save-exact hugo-extended@latest"
   },
+<<<<<<< HEAD
   "dependencies": {
+=======
+  "Dependencies": {
+>>>>>>> f94fd5b2236a13741b9dcbdd61b12098d2bfdc98
     "autoprefixer": "^10.4.14",
     "cross-env": "^7.0.3",
     "hugo-extended": "0.125.4",