Skip to content

Commit

Permalink
updated gh actions for new dependency installation process
Browse files Browse the repository at this point in the history
  • Loading branch information
sllynn committed Nov 20, 2024
1 parent b165a72 commit bd493f4
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 26 deletions.
19 changes: 3 additions & 16 deletions .github/actions/scala_build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,9 @@ runs:
- name: Add packaged GDAL dependencies
shell: bash
run : |
# - update apt
sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc)-backports main universe multiverse restricted"
sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc)-updates main universe multiverse restricted"
sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc)-security main multiverse restricted universe"
sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main multiverse restricted universe"
sudo apt-get update -y
# - install natives
sudo apt-get install -y unixodbc libcurl3-gnutls libsnappy-dev libopenjp2-7
sudo apt-get install -y gdal-bin libgdal-dev python3-numpy python3-gdal zip unzip
# - install pip libs
pip install --upgrade pip
pip install gdal==${{ matrix.gdal }}
# - add the so files
sudo wget -nv -P /usr/lib -nc https://raw.githubusercontent.com/databrickslabs/mosaic/main/resources/gdal/jammy/libgdalalljni.so
sudo wget -nv -P /usr/lib -nc https://raw.githubusercontent.com/databrickslabs/mosaic/main/resources/gdal/jammy/libgdalalljni.so.30
sudo wget -nv -P /usr/lib -nc https://raw.githubusercontent.com/databrickslabs/mosaic/main/resources/gdal/jammy/libgdalalljni.so.30.0.3
sudo dpkg -i python/mosaic/gdal/gdal_3.10.0-1_amd64.deb || :
sudo apt-get update && sudo apt-get install -f -y
sudo dpkg -i python/mosaic/gdal/gdal_3.10.0-1_amd64.deb
- name: Test and build the scala JAR - skip tests is false
if: inputs.skip_tests == 'false'
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
matrix:
python: [ 3.11.0 ]
numpy: [ 1.22.4 ]
gdal: [ 3.4.1 ]
gdal: [ 3.10.0 ]
spark: [ 3.5.0 ]
R: [ 4.3.2 ]
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
matrix:
python: [ 3.11.0 ]
numpy: [ 1.22.4 ]
gdal: [ 3.4.1 ]
gdal: [ 3.10.0 ]
spark: [ 3.5.0 ]
R: [ 4.3.2 ]
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_r.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
python: [ 3.11.0 ]
numpy: [ 1.22.4 ]
gdal: [ 3.4.1 ]
gdal: [ 3.10.0 ]
spark: [ 3.5.0 ]
R: [ 4.3.2 ]
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_scala.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
matrix:
python: [ 3.11.0 ]
numpy: [ 1.22.4 ]
gdal: [ 3.4.1 ]
gdal: [ 3.10.0 ]
spark: [ 3.5.0 ]
R: [ 4.3.2 ]
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
python: [ 3.11.0 ]
numpy: [ 1.22.4 ]
gdal: [ 3.4.1 ]
gdal: [ 3.10.0 ]
spark: [ 3.5.0 ]
R: [ 4.3.2 ]
steps:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,7 @@ import scala.util.Try
object MosaicGDAL extends Logging {

private val usrlibsoPath = "/usr/lib/x86_64-linux-gnu/libgdal.so"
// private val usrlibso30Path = "/usr/lib/libgdal.so.30"
// private val usrlibso3003Path = "/usr/lib/libgdal.so.30.0.3"
private val libjnisoPath = "/usr/lib/x86_64-linux-gnu/jni/libgdalalljni.so"
// private val libjniso30Path = "/usr/lib/libgdalalljni.so.30"
// private val libjniso3003Path = "/usr/lib/libgdalalljni.so.30.0.3"
// private val libogdisoPath = "/usr/lib/ogdi/4.1/libgdal.so"

val defaultBlockSize = 1024
val vrtBlockSize = 128 // This is a must value for VRTs before GDAL 3.7
Expand Down

0 comments on commit bd493f4

Please sign in to comment.