Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
szaghi committed Oct 30, 2023
2 parents 2b04def + 1039836 commit aab8f72
Show file tree
Hide file tree
Showing 9 changed files with 103 additions and 89 deletions.
74 changes: 74 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name: CI

on: push

jobs:
test-deploy:

runs-on: ubuntu-latest
permissions:
contents: write

steps:
- name: PREPARE SYSTEM
run: |
python --version
gfortran --version
gcov --version
sudo apt install graphviz
pip install --upgrade markdown
pip install --upgrade markdown-include
pip install --upgrade python-markdown-math
pip install --upgrade toposort
pip install --upgrade jinja2
pip install --upgrade pygments
pip install --upgrade beautifulsoup4
pip install --upgrade graphviz
pip install --upgrade tqdm
pip install --upgrade importlib-metadata
pip install --upgrade ford && ford --version
pip install --upgrade FoBiS.py && FoBiS.py --version
- name: CHECKOUT
id: checkout
run: |
git clone --recursive https://github.com/$GITHUB_REPOSITORY ./
git log -n 1
tag=`git tag | tail -n 1`
echo "RELEASE=$tag" >> $GITHUB_ENV
- name: MAKE TAR
run: |
echo "release version:" ${{ env.RELEASE }}
FoBiS.py rule -ex maketar
ls *.tar.gz
- name: DEPLOY ASSET
if: ${{ !env.ACT }}
uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: ${{ env.RELEASE }}
prerelease: false
title: ${{ env.RELEASE }}
files: |
*.tar.gz
./scripts/install.sh
- name: MAKE COVERAGE
run: |
FoBiS.py rule -ex makecoverage
- name: UPLOAD COVERAGE to CODECOV
if: ${{ !env.ACT }}
uses: codecov/codecov-action@v3

- name: MAKE DOC
run: |
FoBiS.py rule -ex makedoc
- name: PUSH DOC to GH Pages
if: ${{ !env.ACT }}
uses: JamesIves/github-pages-deploy-action@v4
with:
folder: doc/html
18 changes: 18 additions & 0 deletions .github/workflows/install.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Test (alternative) Install Methods

on: push

jobs:
install:

runs-on: ubuntu-latest
permissions:
contents: write

steps:
- name: INSTALL SCRIPT + cmake
run: |
wget $(curl -s https://api.github.com/repos/$GITHUB_REPOSITORY/releases/latest | grep 'browser_' | cut -d\" -f4 | grep -i install.sh)
chmod +x install.sh
./install.sh --download wget --build cmake
rm -rf *
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
branch = master
[submodule "src/third_party/fortran_tester"]
path = src/third_party/fortran_tester
url = git@github.com:pdebuyl/fortran_tester.git
url = https://github.com/pdebuyl/fortran_tester
branch = master
73 changes: 0 additions & 73 deletions .travis.yml

This file was deleted.

9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<a name="top"></a>

# FiNeR [![GitHub tag](https://img.shields.io/github/tag/szaghi/FiNeR.svg)]()
# FiNeR [![GitHub tag](https://img.shields.io/github/tag/szaghi/FiNeR.svg)](https://github.com/szaghi/FiNeR/releases)

[![License](https://img.shields.io/badge/license-GNU%20GeneraL%20Public%20License%20v3%20,%20GPLv3-blue.svg)]()
[![License](https://img.shields.io/badge/license-BSD2-red.svg)]()
[![License](https://img.shields.io/badge/license-BSD3-red.svg)]()
[![License](https://img.shields.io/badge/license-MIT-red.svg)]()

[![Status](https://img.shields.io/badge/status-stable-brightgreen.svg)]()
[![Build Status](https://travis-ci.org/szaghi/FiNeR.svg?branch=master)](https://travis-ci.org/szaghi/FiNeR)
[![Coverage Status](https://img.shields.io/codecov/c/github/szaghi/FiNeR.svg)](http://codecov.io/github/szaghi/FiNeR?branch=master)
[![CI Status](https://github.com/szaghi/FiNeR/actions/workflows/ci.yml/badge.svg)](https://github.com/szaghi/FiNeR/actions)
[![Coverage Status](https://img.shields.io/codecov/c/github/szaghi/FiNeR.svg)](https://app.codecov.io/gh/szaghi/FiNeR)

### FiNeR, Fortran INI ParseR and generator for FoRtraners

Expand All @@ -21,9 +21,6 @@

#### Issues
[![GitHub issues](https://img.shields.io/github/issues/szaghi/FiNeR.svg)]()
[![Ready in backlog](https://badge.waffle.io/szaghi/FiNeR.png?label=ready&title=Ready)](https://waffle.io/szaghi/FiNeR)
[![In Progress](https://badge.waffle.io/szaghi/FiNeR.png?label=in%20progress&title=In%20Progress)](https://waffle.io/szaghi/FiNeR)
[![Open bugs](https://badge.waffle.io/szaghi/FiNeR.png?label=bug&title=Open%20Bugs)](https://waffle.io/szaghi/FiNeR)

#### Compiler Support

Expand Down
5 changes: 2 additions & 3 deletions doc/main_page.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ summary: Fortran INI ParseR and generator
author: Stefano Zaghi
github: https://github.com/szaghi
email: stefano.zaghi@gmail.com
md_extensions: markdown.extensions.toc(anchorlink=True)
markdown.extensions.smarty(smart_quotes=False)
md_extensions: markdown.extensions.toc
markdown.extensions.smarty
markdown.extensions.extra
markdown_checklist.extension
docmark: <
display: public
protected
Expand Down
3 changes: 1 addition & 2 deletions fobos
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,9 @@ rule = tar --xform="s%^%FiNeR/%" -czf FiNeR.tar.gz *
help = Perform coverage analysis
rule_1 = FoBiS.py clean -mode tests-gnu
rule_2 = FoBiS.py build -mode tests-gnu -coverage
rule_3 = ./exe/autotest
rule_3 = ./scripts/run_tests.sh
rule_4 = rm -f exe/obj/befor64* exe/obj/face* exe/obj/flap* exe/obj/penf* exe/obj/stringifor*
rule_5 = gcov -o exe/obj/ src/lib/finer*
rule_6 = rm -f *.gcov

[rule-makecoverage-analysis]
help = Perform coverage analysis and saving reports in markdown
Expand Down
6 changes: 3 additions & 3 deletions scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ function projectdownload () {
fi

if [ "$DOWNLOAD" == "git" ]; then
git clone $GITHUB
git clone --recursive $GITHUB
cd $PROJECT
git submodule update --init
git submodule update --init --recursive
cd -
elif [ "$DOWNLOAD" == "wget" ]; then
wget $(curl -s https://api.github.com/repos/$USERNAME/$PROJECT/releases/latest | grep 'browser_' | cut -d\" -f4)
wget $(curl -s https://api.github.com/repos/$USERNAME/$PROJECT/releases/latest | grep 'browser_' | cut -d\" -f4 | grep -i tar.gz)
tar xf $PROJECT.tar.gz
rm -f $PROJECT.tar.gz
fi
Expand Down
2 changes: 1 addition & 1 deletion src/third_party/fortran_tester
Submodule fortran_tester updated 4 files
+1 −1 LICENSE
+3 −3 README.md
+18 −0 fpm.toml
+1 −1 src/tester.f90

0 comments on commit aab8f72

Please sign in to comment.