Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into cmake_build2
Browse files Browse the repository at this point in the history
  • Loading branch information
Rashad Kanavath committed May 28, 2020
2 parents 4f75c29 + 9019e6c commit ce601a9
Show file tree
Hide file tree
Showing 396 changed files with 9,135 additions and 4,934 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
docker
!docker/testdata
!docker/alpine/alpine-py38-ctypes.patch
!docker/alpine/alpine-py38-gisinit.patch
.git
.gitignore
.github
Expand Down
40 changes: 40 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
name: Bug report
about: Create a report to help us improve
title: "[Bug]"
labels: 'bug'
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '...'
3. Compute '...'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**System description (please complete the following information):**

- Operating System: [e.g. Windows, Linux, ..., incl. version]
- GRASS GIS version [e.g. 7.8.1]

<!---
- details about further software components
- run `g.version -rge` in a GRASS GIS terminal session or check in
the GUI menu "Help > About"
--->

**Additional context**
Add any other context about the problem here.
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Feature request
about: Suggest an idea for this project
title: "[Feat]"
labels: 'enhancement'
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is.
Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features
you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
22 changes: 22 additions & 0 deletions .github/workflows/apt.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
bison
build-essential
flex
libbz2-dev
libcairo-dev
libfftw3-dev
libgdal-dev
libgl1-mesa-dev
libglu1-mesa-dev
libnetcdf-dev
libopenblas-dev
libpng-dev
libproj-dev
libreadline-dev
libzstd-dev
python3-dateutil
python3-numpy
python3-ply
python3-six
python3-termcolor
sqlite3
zlib1g-dev
46 changes: 46 additions & 0 deletions .github/workflows/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#!/usr/bin/env bash

# The make step requires something like:
# export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PREFIX/lib"
# further steps additionally require:
# export PATH="$PATH:$PREFIX/bin"

# fail on non-zero return code from a subprocess
set -e

# print commands
set -x

if [ -z "$1" ]
then
echo "Usage: $0 PREFIX"
exit 1
fi

# non-existent variables as an errors
set -u

export INSTALL_PREFIX=$1

./configure \
--prefix="$INSTALL_PREFIX/" \
--enable-largefile \
--with-cxx \
--with-zstd \
--with-bzlib \
--with-blas \
--with-lapack \
--with-readline \
--with-openmp \
--with-pthread \
--with-tiff \
--with-freetype \
--with-freetype-includes="/usr/include/freetype2/" \
--with-proj-share=/usr/share/proj \
--with-geos \
--with-sqlite \
--with-fftw \
--with-netcdf

make
make install
42 changes: 42 additions & 0 deletions .github/workflows/build_centos.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#!/usr/bin/env bash

# The make step requires something like:
# export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PREFIX/lib"
# further steps additionally require:
# export PATH="$PATH:$PREFIX/bin"

# fail on non-zero return code from a subprocess
set -e

# print commands
set -x

if [ -z "$1" ]
then
echo "Usage: $0 PREFIX"
exit 1
fi

# non-existent variables as an errors
set -u

export INSTALL_PREFIX=$1

./configure \
--prefix="$INSTALL_PREFIX/" \
--without-freetype \
--with-sqlite \
--with-cairo --with-cairo-ldflags=-lfontconfig \
--with-freetype --with-freetype-includes=/usr/include/freetype2 \
--with-proj --with-proj-share=/usr/share/proj \
--with-gdal=/usr/bin/gdal-config \
--without-zstd \
--without-tiff \
--without-ffmpeg \
--without-mysql \
--without-postgres \
--without-odbc \
--without-fftw

make
make install
58 changes: 58 additions & 0 deletions .github/workflows/centos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: CentOS

on:
- push
- pull_request

jobs:
build:
name: ${{ matrix.os }} build

runs-on: ubuntu-18.04
container: ${{ matrix.os }}
strategy:
matrix:
os:
- centos:7
fail-fast: false

steps:
- uses: actions/checkout@v2
- name: Get dependencies
run: |
yum install -y epel-release
yum install -y wget gawk
yum install -y $(cat .github/workflows/yum.txt)
- name: Install conda
run: |
wget https://repo.anaconda.com/archive/Anaconda3-2020.02-Linux-x86_64.sh
chmod u+x Anaconda3-2020.02-Linux-x86_64.sh
./Anaconda3-2020.02-Linux-x86_64.sh -b
- name: Set variables with conda executable and activate
run: |
echo "::set-env name=CONDA::/github/home/anaconda3/bin/conda"
echo "::set-env name=CONDA_ACTIVATE::/github/home/anaconda3/bin/activate"
- name: Get GRASS GIS runtime conda dependencies
run: |
source $CONDA_ACTIVATE
$CONDA install -y -c anaconda numpy wxpython python-dateutil ply termcolor
- name: Create installation directory
run: |
mkdir $HOME/install
- name: Set number of cores for compilation
run: |
echo "::set-env name=MAKEFLAGS::-j$(nproc)"
- name: Set LD_LIBRARY_PATH for compilation
run: |
echo "::set-env name=LD_LIBRARY_PATH::$HOME/install/lib"
- name: Build
run: |
source $CONDA_ACTIVATE
.github/workflows/build_centos.sh $HOME/install
- name: Add the bin directory to PATH
run: |
echo "::add-path::$HOME/install/bin"
- name: Test executing of the grass command
run: |
source $CONDA_ACTIVATE
.github/workflows/test_simple.sh
75 changes: 75 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: CI

on:
- push
- pull_request

jobs:
build:
name: ${{ matrix.os }} build

runs-on: ${{ matrix.os }}
strategy:
matrix:
os:
- ubuntu-16.04
- ubuntu-18.04
fail-fast: false

steps:
- uses: actions/checkout@v2
- name: Get dependencies
run: |
sudo apt-get update -y
sudo apt-get install -y wget git gawk findutils
xargs -a <(awk '! /^ *(#|$)/' ".github/workflows/apt.txt") -r -- \
sudo apt-get install -y --no-install-recommends --no-install-suggests
- name: Create installation directory
run: |
mkdir $HOME/install
- name: Ensure one core for compilation
run: |
echo "::set-env name=MAKEFLAGS::-j1"
- name: Set LD_LIBRARY_PATH for compilation
run: |
echo "::set-env name=LD_LIBRARY_PATH::$HOME/install/lib"
- name: Build
run: .github/workflows/build.sh $HOME/install

test:
name: ${{ matrix.os }} tests

runs-on: ${{ matrix.os }}
strategy:
matrix:
os:
- ubuntu-16.04
- ubuntu-18.04
fail-fast: false

steps:
- uses: actions/checkout@v2
- name: Get dependencies
run: |
sudo apt-get update -y
sudo apt-get install -y wget git gawk findutils
xargs -a <(awk '! /^ *(#|$)/' ".github/workflows/apt.txt") -r -- \
sudo apt-get install -y --no-install-recommends --no-install-suggests
- name: Create installation directory
run: |
mkdir $HOME/install
- name: Set number of cores for compilation
run: |
echo "::set-env name=MAKEFLAGS::-j$(nproc)"
- name: Set LD_LIBRARY_PATH for compilation
run: |
echo "::set-env name=LD_LIBRARY_PATH::$HOME/install/lib"
- name: Build
run: .github/workflows/build.sh $HOME/install
- name: Add the bin directory to PATH
run: |
echo "::add-path::$HOME/install/bin"
- name: Test executing of the grass command
run: .github/workflows/test_simple.sh
- name: Run tests
run: .github/workflows/test_thorough.sh
Loading

0 comments on commit ce601a9

Please sign in to comment.