Skip to content

Commit

Permalink
Update to Ubuntu 24.04, GRASS GIS branch for 8.4 (#76)
Browse files Browse the repository at this point in the history
Update to Ubuntu 24.04, GRASS GIS branch for 8.4. Test only the supported branch and PPA, but not old branch (there is not pre-release branch at this point).

Also remove unused dependencies and code for GRASS GIS v7.8.
  • Loading branch information
wenzeslaus authored Oct 22, 2024
1 parent f5063a9 commit fe60f88
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 20 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/apt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ libbz2-dev
libcairo-dev
libfftw3-dev
libgdal-dev
libgl1-mesa-dev
libglu1-mesa-dev
libnetcdf-dev
libopenblas-dev
libpng-dev
libproj-dev
libreadline-dev
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ cd grass
--with-cxx \
--with-zstd \
--with-bzlib \
--with-blas \
--with-lapack \
--with-readline \
--with-openmp \
--with-pthread \
Expand All @@ -48,6 +46,7 @@ cd grass
--with-sqlite \
--with-fftw \
--with-netcdf \
--without-opengl \
--without-pdal

make
Expand Down
17 changes: 2 additions & 15 deletions .github/workflows/ci-compiled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,10 @@ jobs:
matrix:
include:
- version: main
command: grass
- version: releasebranch_8_2
command: grass
- version: releasebranch_8_0
command: grass
- version: releasebranch_8_4
fail-fast: false

runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v1
Expand Down Expand Up @@ -61,11 +57,6 @@ jobs:
- name: Add the bin directory to PATH
run: |
echo "$HOME/install/bin" >> $GITHUB_PATH
- name: Make simple grass command available
run: |
if [ ! -f "$HOME/install/bin/grass" ]; then
ln -s "$HOME/install/bin/${{ matrix.command }}" "$HOME/install/bin/grass"
fi
- name: Get GRASS GIS version
run: |
grass --version
Expand All @@ -78,10 +69,6 @@ jobs:
with:
path: nc_spm_08_grass7
key: ${{ runner.os }}-nc_spm_08_grass7
- name: Get data download tool for v7 (g.download.location)
if: steps.cache-nc_spm_08_grass7.outputs.cache-hit != 'true' && matrix.version == 'releasebranch_7_8'
run: |
grass --tmp-location XY --exec g.extension g.download.location --verbose
- name: Get sample data for testing (NC SPM sample location)
if: steps.cache-nc_spm_08_grass7.outputs.cache-hit != 'true'
run: |
Expand Down

0 comments on commit fe60f88

Please sign in to comment.