Skip to content

Commit

Permalink
Pull from main branch.
Browse files Browse the repository at this point in the history
Merge branch 'develop' of https://github.com/PecanProject/pecan into develop

# Conflicts:
#	modules/assim.sequential/DESCRIPTION
  • Loading branch information
Dongchen Zhang committed Sep 18, 2024
2 parents fecb781 + f22a7c4 commit b407404
Show file tree
Hide file tree
Showing 555 changed files with 3,806 additions and 5,497 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/book.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: renderbook
on:
push:
branches:
- master
- main
- develop
tags:
- '*'
Expand Down Expand Up @@ -65,9 +65,12 @@ jobs:
git config --global user.email "pecanproj@gmail.com"
git config --global user.name "GitHub Documentation Robot"
export VERSION=$(echo $GITHUB_REF | sed 's,.*/,,' )
if [ "$VERSION" = "main" ]; then
export VERSION=latest
fi
cd pecan-documentation
mkdir -p $VERSION
rsync -a --delete ../book_source/_book/ ${VERSION}/
git add --all *
git commit -m "Build book from pecan revision ${GITHUB_SHA}" || true
git push -q origin master
git push -q origin main
3 changes: 3 additions & 0 deletions .github/workflows/ci-weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
fail-fast: false
matrix:
R:
- "4.3"
- "devel"
uses: ./.github/workflows/test.yml
with:
Expand All @@ -24,6 +25,7 @@ jobs:
fail-fast: false
matrix:
R:
- "4.3"
- "devel"
uses: ./.github/workflows/check.yml
with:
Expand All @@ -36,6 +38,7 @@ jobs:
fail-fast: false
matrix:
R:
- "4.3"
- "devel"
uses: ./.github/workflows/sipnet.yml
with:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ name: CI
on:
push:
branches:
- master
- main
- develop

tags:
- '*'
- "v*.*.*"
pull_request:
merge_group:
issue_comment:
Expand Down
98 changes: 0 additions & 98 deletions .github/workflows/depends.yml

This file was deleted.

Loading

0 comments on commit b407404

Please sign in to comment.