Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testing Windows UCRT #29

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/check-latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ jobs:
if: runner.os == 'Linux'
run: |
sudo apt-get update -y
sudo apt-get install -y libproj-dev libaec-dev libopenjp2-7-dev libpng-dev
sudo apt-get install -y libproj-dev libaec-dev libopenjp2-7-dev libpng-dev python3-dev

- name: Install macOS dependencies
if: runner.os == 'macOS'
run: |
brew install proj libaec openjpeg zlib
brew install proj libaec openjpeg zlib python

- name: Build eccodes from source
run: ./install_eccodes.sh
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check-minimum.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes
ECCODES_VERSION: 2.19.0
ECCODES_VERSION: 2.30.0

steps:
- uses: actions/checkout@v4
Expand All @@ -47,12 +47,12 @@ jobs:
if: runner.os == 'Linux'
run: |
sudo apt-get update -y
sudo apt-get install -y libproj-dev libaec-dev libopenjp2-7-dev libpng-dev
sudo apt-get install -y libproj-dev libaec-dev libopenjp2-7-dev libpng-dev python3-dev

- name: Install macOS dependencies
if: runner.os == 'macOS'
run: |
brew install proj libaec openjpeg zlib
brew install proj libaec openjpeg zlib python

- name: Build eccodes from source (Linux)
if: runner.os == 'Linux'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-standard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ jobs:
if: runner.os == 'Linux'
run: |
sudo apt-get update -y
sudo apt-get install -y libproj-dev libeccodes-dev
sudo apt-get install -y libproj-dev libeccodes-dev python3-dev

- name: Install macOS dependencies
if: runner.os == 'macOS'
run: brew install proj eccodes
run: brew install proj eccodes python

- uses: r-lib/actions/setup-r-dependencies@v2
with:
Expand Down
60 changes: 60 additions & 0 deletions .github/workflows/check-windows.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help

name: Build (Windows UCRT)

on:
push:
branches: [main]
pull_request:
branches: [main]

concurrency:
group: ${{ github.workflow}}-${{ github.head_ref }}
cancel-in-progress: true

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- {os: windows-latest, r: 'release'}
- {os: windows-latest, r: 'devel', http-user-agent: 'release'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
r-tools-version: '44'
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- name: Install dependencies
run: |
pacman -Syu --noconfirm
pacman -S mingw-w64-ucrt-x86_64-proj --noconfirm
pacman -S mingw-w64-ucrt-x86_64-eccodes --noconfirm
pacman -S mingw-w64-ucrt-x86_64-gcc --noconfirm
pacman -S mingw-w64-ucrt-x86_64-python --noconfirm

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck
needs: check

- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: gribr
Type: Package
Title: Read GRIB Files
Version: 1.2.7
Date: 2024-07-12
Version: 1.2.8
Date: 2024-08-16
Author: Nathan Wendt <[email protected]>
Maintainer: Nathan Wendt <[email protected]>
BugReports: https://github.com/nawendt/gribr/issues
Expand All @@ -11,6 +11,6 @@ License: BSD_3_clause + file LICENSE
RoxygenNote: 7.2.3
Encoding: UTF-8
NeedsCompilation: yes
SystemRequirements: ECMWF ecCodes (>= 2.19.0)
SystemRequirements: ECMWF ecCodes (>= 2.30.0)
Imports: proj4, methods, utils
Suggests: testthat, lintr, covr
29 changes: 0 additions & 29 deletions R/zzz.R

This file was deleted.

1 change: 1 addition & 0 deletions configure.ucrt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export PATH=/ucrt64/bin:$PATH
12 changes: 7 additions & 5 deletions install_eccodes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,24 @@ if [[ -z ${OPENJPEG_INCLUDE_DIR} ]]; then
-DENABLE_JPG=ON \
-DENABLE_PNG=ON \
-DENABLE_AEC=ON \
-DENABLE_PYTHON=OFF \
-DENABLE_MEMFS=ON \
-DENABLE_FORTRAN=OFF \
-DENABLE_EXAMPLES=OFF \
-DENABLE_JPG_LIBJASPER=OFF \
-DENABLE_INSTALL_ECCODES_SAMPLES=OFF
-DENABLE_TESTS=OFF \
-DENABLE_BUILD_TOOLS=OFF \
-DENABLE_JPG_LIBJASPER=OFF
else
echo "OPENJPEG_INCLUDE_DIR: ${OPENJPEG_INCLUDE_DIR}"
cmake . -B build -DCMAKE_BUILD_TYPE=Release \
-DENABLE_NETCDF=OFF \
-DENABLE_JPG=ON \
-DENABLE_PNG=ON \
-DENABLE_AEC=ON \
-DENABLE_PYTHON=OFF \
-DENABLE_MEMFS=ON \
-DENABLE_FORTRAN=OFF \
-DENABLE_EXAMPLES=OFF \
-DENABLE_INSTALL_ECCODES_SAMPLES=OFF \
-DENABLE_TESTS=OFF \
-DENABLE_BUILD_TOOLS=OFF \
-DENABLE_JPG_LIBOPENJPEG=ON \
-DENABLE_JPG_LIBJASPER=OFF \
-DOPENJPEG_INCLUDE_DIR=${OPENJPEG_INCLUDE_DIR}
Expand Down
2 changes: 2 additions & 0 deletions src/Makevars.ucrt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
PKG_LIBS="-LC:/rtools44/ucrt64/lib -leccodes -lopenjp2 -ljasper -laec -lpng -lstdc++"
PKG_CPPFLAGS="-IC:/rtools44/ucrt64/include"
Loading