Skip to content

Commit

Permalink
Merge branch 'main' into hb-files
Browse files Browse the repository at this point in the history
  • Loading branch information
hanbollar committed Nov 14, 2023
2 parents 3faaa86 + 690d023 commit 98d59b0
Show file tree
Hide file tree
Showing 7 changed files with 93 additions and 9,459 deletions.
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: npm
directory: "/javascript"
schedule:
interval: "weekly"
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# todo - run the npm install with a dockerfile setup instead of pure
# install but not important to do right now since install isnt too long

- uses: actions/setup-node@v2
- uses: actions/setup-node@v4
with:
node-version: 21

Expand Down
72 changes: 72 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# Auto generate docs as a new commit for the docs repo
name: npm run docs

on:
workflow_dispatch:
push:
branches:
- main

permissions:
contents: read

jobs:
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

# todo - run the npm install with a dockerfile setup instead of pure
# install but not important to do right now since install isnt too long

- uses: actions/setup-node@v3
with:
node-version: 21

- name: Install Dependencies
run: |
npm install
- name: 👷 Write the html docs
run: |
npm run docs
- name: Get Docs content
id: get-docs
run: |
mkdir -p ../doc
cp -rf ./docs/* ../doc/
- name: see if info is there
run: |
echo "ll .."
ls -al ..
echo "ll ."
ls -al .
- name: Checkout docs Repository
uses: actions/checkout@v3
with:
repository: Volumetrics-io/docs
ref: main
token: ${{ secrets.MRJS_AND_DOCS_REPO_PAT }}

- name: Update Docs
run: |
rm -rf auto && mkdir auto
mv -f ../doc/* ./auto/
- name: Commit only if there are changes
run: |
if [[ -n $(git diff --exit-code) ]]; then
echo "Changes detected. Committing and pushing."
git config user.name 'github-actions[bot]'
git config user.email 'github-actions[bot]@users.noreply.github.com'
git add auto/*
git commit -m "👷 MR.js - Auto Generated Docs 👷"
git push --quiet --set-upstream origin HEAD
else
echo "No changes detected. Exiting without committing."
fi
env:
PAT_TOKEN: ${{ secrets.MRJS_AND_DOCS_REPO_PAT }}
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
runs-on: ubuntu-latest
# needs: build # todo
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# todo - run the npm install with a dockerfile setup instead of pure
# install but not important to do right now since install isnt too long

- uses: actions/setup-node@v2
- uses: actions/setup-node@v4
with:
node-version: 18

Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
# todo - dont want merge conflicts in dist, but do want when publish, to resolve.
# dist/*

# Docs - ignore auto html docs in this repo, they'll be exported to the docs repo
docs/*

# Logs
logs
*.log
Expand Down
Loading

0 comments on commit 98d59b0

Please sign in to comment.