Merge remote-tracking branch 'origin/master-ng' into develop

# Conflicts:
#	Moose Development/Moose/AI/AI_A2G_BAI.lua
#	Moose Development/Moose/AI/AI_CAP.lua
#	Moose Development/Moose/Modules_local.lua
This commit is contained in:
Applevangelist
2026-02-06 14:35:47 +01:00
58 changed files with 40 additions and 40947 deletions
+5 -5
View File
@@ -3,7 +3,7 @@ name: Moose-Docs
on:
push:
branches:
- master
- master-ng
- develop
paths:
- 'Moose Setup/**/*.lua'
@@ -113,7 +113,7 @@ jobs:
- name: Check replacement of head tag
run: |
head -10 ${{ github.workspace }}/build/doc/AI.AI_A2A_Cap.html
head -10 ${{ github.workspace }}/build/doc/Core.Menu.html
#########################################################################
# Push to MOOSE_DOCS
@@ -122,7 +122,7 @@ jobs:
shell: bash
id: set_doc_repo
run: |
if [[ $GITHUB_REF == 'refs/heads/master' ]]; then
if [[ $GITHUB_REF == 'refs/heads/master-ng' ]]; then
echo "docrepo=MOOSE_DOCS" >> "$GITHUB_OUTPUT"
else
echo "docrepo=MOOSE_DOCS_DEVELOP" >> "$GITHUB_OUTPUT"
@@ -134,7 +134,7 @@ jobs:
repository: ${{ github.repository_owner }}/${{ steps.set_doc_repo.outputs.docrepo }}
path: './build/MOOSE_DOCS'
fetch-depth: 0
ref: 'master'
ref: 'master-ng'
token: ${{ secrets.BOT_TOKEN }}
- name: Delete folder to remove deleted files
@@ -155,7 +155,7 @@ jobs:
git config user.email "MooseBotter@users.noreply.github.com"
git add .
git commit --allow-empty -m "Auto commit by GitHub Actions Workflow"
git push --set-upstream origin master
git push --set-upstream origin 'master-ng'
working-directory: ${{ github.workspace }}/build/MOOSE_DOCS
+1 -1
View File
@@ -3,7 +3,7 @@ name: Moose-Includes
on:
push:
branches:
- master
- master-ng
- develop
- Apple/Develop
+1 -1
View File
@@ -8,7 +8,7 @@ name: Deploy Jekyll site to Pages
on:
push:
branches: ["master"]
branches: ["master-ng"]
paths:
- 'docs/**'
- '.github/workflows/gh-pages.yml'