Merge branch 'master' into eccodes-version-update-for-glofas

ecmwf · Oct 23, 2023 · 678b62c · 678b62c
2 parents 495341f + 1094d4f
commit 678b62c
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 11 deletions.
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
@@ -115,7 +115,7 @@ jobs:
 
     - name: Get some data
       run: |
-        curl -L http://download.ecmwf.int/test-data/magics/2m_temperature.grib -o data.grib
+        curl -L https://get.ecmwf.int/repository/test-data/metview/gallery/2m_temperature.grib -o data.grib
         curl -L https://github.com/ecmwf/climetlab/raw/main/docs/examples/test.grib -o climetlab.grib
         curl -L https://github.com/ecmwf/climetlab/raw/main/docs/examples/test.nc -o climetlab.nc
         ls -l

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -139,7 +139,7 @@ jobs:
 
     - name: Get some data
       run: |
-        curl -L http://download.ecmwf.int/test-data/magics/2m_temperature.grib -o data.grib
+        curl -L https://get.ecmwf.int/repository/test-data/metview/gallery/2m_temperature.grib  -o data.grib
         curl -L https://github.com/ecmwf/climetlab/raw/main/docs/examples/test.grib -o climetlab.grib
         curl -L https://github.com/ecmwf/climetlab/raw/main/docs/examples/test.nc -o climetlab.nc
         ls -l

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -169,7 +169,7 @@ jobs:
 
     - name: Get some data
       run: |
-        curl -L http://download.ecmwf.int/test-data/magics/2m_temperature.grib -o data.grib
+        curl -L https://get.ecmwf.int/repository/test-data/metview/gallery/2m_temperature.grib  -o data.grib
         curl -L https://github.com/ecmwf/climetlab/raw/main/docs/examples/test.grib -o climetlab.grib
         curl -L https://github.com/ecmwf/climetlab/raw/main/docs/examples/test.nc -o climetlab.nc
         ls -l

diff --git a/scripts/build-linux.sh b/scripts/build-linux.sh
@@ -111,13 +111,13 @@ ninja -C build-other/pixman install
 # Build cairo
 # -Dqt=disabled
 
-[[ -d src/cairo ]] || git clone --depth 1 $GIT_CAIRO src/cairo
+[[ -d src/cairo ]] || git clone $GIT_CAIRO src/cairo
 cd src/cairo
+git checkout $CAIRO_VERSION
 meson setup --prefix=$TOPDIR/install \
     -Dwrap_mode=nofallback \
     -Dxlib=disabled \
     -Dxcb=disabled \
-    -Dgl-backend=disabled \
     $TOPDIR/build-other/cairo
 
 cd $TOPDIR

diff --git a/scripts/build-windows.sh b/scripts/build-windows.sh
@@ -20,10 +20,15 @@ cd $here
 
 echo git $url $sha1 > versions
 
+# the results of the following suggested that pkg-config.exe is not installed on the latest
+# Windows runner
+#find /c/ -name pkg-config.exe
+#exit 1
+
 if [[ $WINARCH == "x64" ]]; then
-    PKG_CONFIG_EXECUTABLE=/c/rtools40/mingw64/bin/pkg-config.exe
+    PKG_CONFIG_EXECUTABLE=/c/rtools43/mingw64/bin/pkg-config.exe
 else
-    PKG_CONFIG_EXECUTABLE=/c/rtools40/mingw32/bin/pkg-config.exe
+    PKG_CONFIG_EXECUTABLE=/c/rtools43/mingw32/bin/pkg-config.exe
 fi
 
 for p in expat netcdf-c[core,netcdf-4,hdf5] pango sqlite3[core,tool] libpng

diff --git a/scripts/common.sh b/scripts/common.sh
@@ -29,11 +29,11 @@ PROJ_VERSION=master
 GIT_AEC=https://github.com/MathisRosenhauer/libaec.git
 AEC_VERSION=master
 
-GIT_PIXMAN=https://github.com/freedesktop/pixman.git
+GIT_PIXMAN=https://gitlab.freedesktop.org/pixman/pixman
 PIXMAN_VERSION=master
 
-GIT_CAIRO=https://github.com/freedesktop/cairo.git
-CAIRO_VERSION=master
+GIT_CAIRO=https://gitlab.freedesktop.org/cairo/cairo
+CAIRO_VERSION=1.17.6
 
 GIT_HARFBUZZ=https://github.com/harfbuzz/harfbuzz.git
 HARFBUZZ_VERSION=master

diff --git a/tools/copy-licences.py b/tools/copy-licences.py
@@ -152,7 +152,12 @@ def identity(x):
     "libzstd": {
         "home": "https://github.com/facebook/zstd",
         "copying": "https://raw.githubusercontent.com/facebook/zstd/master/LICENSE",
-    }
+    },
+    # not completely clear what the definitive source for this library is
+    "liblzma": {
+        "home": "https://github.com/ShiftMediaProject/liblzma",
+        "copying": "https://raw.githubusercontent.com/ShiftMediaProject/liblzma/master/COPYING",
+    },
     # "libcurl": {
     #     "home": "https://github.com/curl/curl",
     #     "copying": "https://raw.githubusercontent.com/curl/curl/master/COPYING",