Skip to content

Commit

Permalink
Revert "Merge branch 'main' into gmodeler_panel"
Browse files Browse the repository at this point in the history
This reverts commit a5d2b8c, reversing
changes made to f6545f3.
  • Loading branch information
landam committed Nov 6, 2023
1 parent a5d2b8c commit ede7cdf
Show file tree
Hide file tree
Showing 341 changed files with 4,919 additions and 11,010 deletions.
2 changes: 0 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ docker
.github
.travis
.travis.yml
# Do not copy files from previous compilations
dist.*

# The following git files are needed by GRASS GIS to extract the revision
# during compilation. If you are not using one of the Dockerimages from this
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/additional_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: Checkout repository contents
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
uses: actions/checkout@v3
with:
fetch-depth: 31

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/apt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ python3-numpy
python3-pil
python3-ply
python3-pyvirtualdisplay
python3-six
python3-termcolor
sqlite3
zlib1g-dev
48 changes: 48 additions & 0 deletions .github/workflows/black.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
---
name: Python Black Formatting

on:
push:
branches:
- main
- releasebranch_*
pull_request:
branches:
- main
- releasebranch_*

concurrency:
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
cancel-in-progress: true

jobs:
run-black:
name: Black

# Using matrix just to get variables which are not environmental variables
# and also to sync with other workflows which use matrix.
strategy:
matrix:
include:
- os: ubuntu-22.04
python-version: '3.10'
black-version: '23.1.0'

runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Install
run: |
python -m pip install --upgrade pip
pip install black==${{ matrix.black-version }}
- name: Run Black
run: |
black --check --diff .
48 changes: 48 additions & 0 deletions .github/workflows/build_centos.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#!/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

# Old versions of GCC on CentOS default to C89 although are C11 capable
# This causes compilation to fail on >C89 code
export CFLAGS="-O2 -std=gnu11"
export CXXFLAGS="-std=gnu++11"

./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-libpng=/usr/bin/libpng-config \
--with-gdal=/usr/bin/gdal-config \
--without-zstd \
--without-tiff \
--without-ffmpeg \
--without-mysql \
--without-postgres \
--without-odbc \
--without-fftw \
--without-pdal

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

on:
push:
branches:
- main
- releasebranch_*
pull_request:
branches:
- main
- releasebranch_*

concurrency:
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
cancel-in-progress: true

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

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

steps:
- uses: actions/checkout@v3
- 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 "CONDA=/github/home/anaconda3/bin/conda" >> $GITHUB_ENV
echo "CONDA_ACTIVATE=/github/home/anaconda3/bin/activate" >> $GITHUB_ENV
- 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 "MAKEFLAGS=-j$(nproc)" >> $GITHUB_ENV
- name: Set LD_LIBRARY_PATH for compilation
run: |
echo "LD_LIBRARY_PATH=$HOME/install/lib" >> $GITHUB_ENV
- name: Build
run: |
source $CONDA_ACTIVATE
.github/workflows/build_centos.sh $HOME/install
- name: Add the bin directory to PATH
run: |
echo "$HOME/install/bin" >> $GITHUB_PATH
- name: Test executing of the grass command
run: |
source $CONDA_ACTIVATE
.github/workflows/test_simple.sh
- name: Print installed versions
if: always()
run: |
source $CONDA_ACTIVATE
.github/workflows/print_versions.sh
2 changes: 1 addition & 1 deletion .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Formatting Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
- uses: actions/checkout@v3
- name: Run clang-format style check for C/C++/Protobuf programs.
uses: jidicula/clang-format-action@v4.11.0
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
uses: actions/checkout@v3

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_release_draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Checks-out repository
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
uses: actions/checkout@v3
with:
fetch-depth: 0

Expand Down
Loading

0 comments on commit ede7cdf

Please sign in to comment.