Skip to content

Commit c8b26b2

Browse files
committed
updates to pages for GitHubCI
other minor changes
1 parent 1a7c38f commit c8b26b2

File tree

9 files changed

+12
-24
lines changed

9 files changed

+12
-24
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ git rebase upstream/master
7272
```
7373
- Create a branch in your fork with a descriptive name that also includes the [issue number](https://github.com/jacobwilliams/json-fortran/issues), if applicable. For example, after forking the repo, you can run something like `git checkout -b Unicode-support-issue-35` before starting work on [issue #35 : Unicode support](https://github.com/jacobwilliams/json-fortran/issues/35)
7474
- When you're content with your changes, your commits are clean, self contained, with concise descriptive messages, and your changes compile and pass the tests, submit a pull request. We will review your changes, and may ask for certain modifications to be made.
75-
- Pull requests are tested by our [travis-ci](https://travis-ci.com/jacobwilliams/json-fortran) continuous integration system, and any errors uncovered will need to be fixed before the pull request can be merged into master.
75+
- Pull requests are tested by our [GitHub Actions](https://github.com/jacobwilliams/json-fortran/actions) continuous integration system, and any errors uncovered will need to be fixed before the pull request can be merged into master.
7676
- The JSON-Fortran library and associated documentation is released under a BSD style [license](https://github.com/jacobwilliams/json-fortran/blob/master/LICENSE). By submitting a pull request, you are agreeing to release your code under the same license. Note that code with GPL or other "copyleft" style licenses will not be accepted.
7777

7878
[top](#contributing-to-json-fortran)

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ if ( NOT SKIP_DOC_GEN )
267267
endif ()
268268
else () # Not found
269269
message ( WARNING
270-
"FORD not found! Please set the CMake cache variable FORD to point to the installed FORD executable, and reconfigure or disable building the documentation. FORD can be installed from PYPI with `sudo pip install FORD` or from <https://github.com/cmacmackin/ford> If you do not wish to install FORD and build the JSON-Fortran documentation, then please set the CMake cache variable SKIP_DOC_GEN to TRUE." )
270+
"FORD not found! Please set the CMake cache variable FORD to point to the installed FORD executable, and reconfigure or disable building the documentation. FORD can be installed from PYPI with `pip install ford` or from <https://github.com/Fortran-FOSS-Programmers/ford> If you do not wish to install FORD and build the JSON-Fortran documentation, then please set the CMake cache variable SKIP_DOC_GEN to TRUE." )
271271
endif ()
272272
endif ()
273273

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ A Fortran 2008 JSON API
2121

2222
Status
2323
------
24-
[![Build Status](https://img.shields.io/travis/jacobwilliams/json-fortran/master.svg?style=plastic)](https://travis-ci.com/github/jacobwilliams/json-fortran)
24+
![Build Status](https://github.com/jacobwilliams/json-fortran/actions/workflows/CI.yml/badge.svg)
2525
[![GitHub issues](https://img.shields.io/github/issues/jacobwilliams/json-fortran.png?style=plastic)](https://github.com/jacobwilliams/json-fortran/issues)
2626
[![Codecov](https://codecov.io/gh/jacobwilliams/json-fortran/branch/master/graph/badge.svg)](https://codecov.io/gh/jacobwilliams/json-fortran)
2727

@@ -168,7 +168,6 @@ Miscellaneous
168168

169169
* JSON-Fortran is a fork and extensive upgrade of the Fortran 95 [FSON](https://github.com/josephalevin/fson) code. The reason for the split was to be able to incorporate object-oriented and other nice features of the Fortran 2003 and 2008 standards. Many thanks to the original authors of FSON.
170170
* For more information about JSON, see: <http://www.json.org/>
171-
* [json-fortran on Travis CI](https://travis-ci.com/jacobwilliams/json-fortran)
172171
* [json-fortran on Codecov.IO](https://codecov.io/gh/jacobwilliams/json-fortran)
173172

174173
[top](#json-fortran)

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ if [[ $JF_SKIP_DOCS != [yY]* ]]; then
390390
echo "$FPP" > .PREPROCESSOR # Override via include in project file, until FORD gets CLI for this
391391
ford --debug "${MACRO_FLAG[@]}" -p "$PAGESDIR" "$FORDMD"
392392
else
393-
echo "FORD not found! Install using: sudo pip install ford"
393+
echo "FORD not found! Install using: pip install ford"
394394
fi
395395
else
396396
echo "Skip building documentation since \$JF_SKIP_DOCS has been set to ${JF_SKIP_DOCS}."

json-fortran.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The **current stable release** is **{!.VERSION!}** and can be [downloaded
5959
on GitHub](https://github.com/jacobwilliams/json-fortran/releases/latest)
6060
or installed with [Homebrew](http://brew.sh) on MacOS. The
6161
documentation for the current version, **{!.VERSION!}**, can be
62-
found [here](http://jacobwilliams.github.io/json-fortran/{!.VERSION!}/index.html)[^1], and a
62+
found [here](http://jacobwilliams.github.io/json-fortran/prev/{!.VERSION!}/index.html)[^1], and a
6363
list of changes from the previous version are
6464
[here](http://jacobwilliams.github.io/json-fortran/page/releases/index.html#change-log).
6565

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
title: .travis.yml
1+
title: CI.yml
22

33
This is the
4-
[Travis-CI](https://travis-ci.com/jacobwilliams/json-fortran) script
4+
[GitHub Actions](https://github.com/jacobwilliams/json-fortran/actions) script
55
used to perform continuous integration testing for JSON-Fortran, and
66
trigger automatic documentation deployment.
77

88
```yml
9-
{!.travis.yml!}
9+
{!.github/workflows/.CI.yml!}
1010
```

pages/development-resources/deploy.sh.md

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

pages/development-resources/index.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ scripts used in building and testing JSON-Fortran, as well as
3131
deploying documentation and managing test coverage information.
3232

3333
- [`build.sh`](build.sh.html)
34-
- [`deploy.sh`](deploy.sh.html)
35-
- [`.travis.yml`](travis.yml.html)
34+
- [`CI.yml`](CI.yml.html)
3635
- [`codecov.yml`](codecov.yml.html)
3736
- [`gccr.pl`](gccr.pl.html)
3837

pages/development-resources/release-checklist.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,9 @@ remain accurate.
5858
1. Commit the changes to the master branch: `git commit`
5959
1. Create the tag: `git tag <new version>`
6060
1. Note: for some reason, using GitHub to tag a project means that the tag doesn't show up when you `git describe` the project. Tagging from the command line makes `git describe` work as expected.
61-
1. [deploy.sh](deploy.sh.html) will publish the documentation for the
62-
latest tag from
63-
[Travis-CI](https://travis-ci.com/jacobwilliams/json-fortran) to
64-
https://jacobwilliams.github.io/json-fortran/*new_ver*/ if all
61+
1. [GitHub Actions](CI.yml.html) will publish the documentation for the
62+
latest tag to
63+
https://jacobwilliams.github.io/json-fortran/prev/*new_ver*/ if all
6564
goes according to plan
6665
1. Push tags and master to GitHub: `git push --tags origin master`
6766
1. [Draft and publish](https://github.com/jacobwilliams/json-fortran/releases/new)

0 commit comments

Comments
 (0)