Skip to content

Commit

Permalink
CI: drop CentOS runner and update OSGeo4W (#3654)
Browse files Browse the repository at this point in the history
* CI: drop outdated CentOS 7 compilation (#3141)

Remove of CentOS 7 compilation as no longer compatible with new GHA checkout v4 (see #3138 - Background: default runtime now node20. Node16 has end of life on 11 Sep 2023).

Co-authored-by: Vaclav Petras <wenzeslaus@gmail.com>

* windows: use Python 3.12 with updated OSGeo4W (#3603)

See: https://lists.osgeo.org/pipermail/grass-dev/2024-April/096269.html

---------

Co-authored-by: Markus Neteler <neteler@osgeo.org>
Co-authored-by: Vaclav Petras <wenzeslaus@gmail.com>
  • Loading branch information
3 people committed Apr 23, 2024
1 parent de3d65c commit bab8545
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 166 deletions.
48 changes: 0 additions & 48 deletions .github/workflows/build_centos.sh

This file was deleted.

74 changes: 0 additions & 74 deletions .github/workflows/centos.yml

This file was deleted.

37 changes: 0 additions & 37 deletions .github/workflows/yum.txt

This file was deleted.

1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
[![General linting](https://github.com/OSGeo/grass/workflows/General%20linting/badge.svg)](https://github.com/OSGeo/grass/actions?query=workflow%3A%22General+linting%22)
[![Ubuntu](https://github.com/OSGeo/grass/workflows/Ubuntu/badge.svg)](https://github.com/OSGeo/grass/actions?query=workflow%3AUbuntu)
[![OSGeo4W](https://github.com/OSGeo/grass/workflows/OSGeo4W/badge.svg)](https://github.com/OSGeo/grass/actions?query=workflow%3AOSGeo4W)
[![CentOS](https://github.com/OSGeo/grass/workflows/CentOS/badge.svg)](https://github.com/OSGeo/grass/actions?query=workflow%3ACentOS)
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5176030.svg)](https://doi.org/10.5281/zenodo.5176030)
[![Join the chat at https://gitter.im/grassgis/community](https://badges.gitter.im/grassgis/community.svg)](https://gitter.im/grassgis/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

Expand Down
4 changes: 2 additions & 2 deletions mswindows/GRASS-Packager.bat.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ xcopy %OSGEO4W_PKG_DIR%\share\gdal %PACKAGE_DIR%\share\gdal /S/V/F/I
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.

mkdir %PACKAGE_DIR%\Python39
mkdir %PACKAGE_DIR%\Python312

xcopy %OSGEO4W_PKG_DIR%\apps\Python39\* %PACKAGE_DIR%\Python39 /S/V/F/I
xcopy %OSGEO4W_PKG_DIR%\apps\Python312\* %PACKAGE_DIR%\Python312 /S/V/F/I

@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions mswindows/crosscompile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,10 @@ if defined GRASS_PYTHON (
) else (
rem Change this variable to override auto-detection of python.exe in
rem PATH
set GRASS_PYTHON=C:\Python39\python.exe
set GRASS_PYTHON=C:\Python312\python.exe
rem For portable installation, use %~d0 for the changing drive letter
rem set GRASS_PYTHON=%~d0\Python39\python.exe
rem set GRASS_PYTHON=%~d0\Python312\python.exe
if not exist "%GRASS_PYTHON%" (
set GRASS_PYTHON=
Expand Down
2 changes: 1 addition & 1 deletion mswindows/env.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ REM Environmental variables for GRASS stand-alone installer
REM

set GRASS_PYTHON=%GISBASE%\extrabin\python3.exe
set PYTHONHOME=%GISBASE%\Python39
set PYTHONHOME=%GISBASE%\Python312

set GRASS_PROJSHARE=%GISBASE%\share\proj

Expand Down
2 changes: 1 addition & 1 deletion mswindows/osgeo4w/build_osgeo4w.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set -e
# compile
export PATH=${OSGEO4W_ROOT_MSYS}/bin:/usr/bin:/mingw64/bin
export C_INCLUDE_PATH=".:${OSGEO4W_ROOT_MSYS}/include:${SRC}/dist.${ARCH}/include:/c/msys64/mingw64/include"
export PYTHONHOME=${OSGEO4W_ROOT_MSYS}/apps/Python39
export PYTHONHOME=${OSGEO4W_ROOT_MSYS}/apps/Python312
export ARCH=x86_64-w64-mingw32

./configure \
Expand Down

0 comments on commit bab8545

Please sign in to comment.