inbo / n2khab

R package with preprocessing functions and standard reference data for Flemish Natura 2000 (N2K) habitat (HAB) analyses
https://inbo.github.io/n2khab
GNU General Public License v3.0
2 stars 1 forks source link

GH actions: revert "Merge PR #125 from inbo/macos_sysdeps_conditional" #127

Closed florisvdh closed 3 years ago

florisvdh commented 3 years ago

This reverts commit b574c1554921e585ec8b6189ad851d1ef0d83203, reversing changes made to 84149e37d7f916ca6c52452b861ccccb01201c57.

Fixes https://github.com/inbo/n2khab/issues/126.

It appears that gdal is often needed when checking gdal, contrary to the findings in https://github.com/inbo/n2khab/pull/125.

Note to self:

$ git log --format='%C(auto)%h (%ai)%d %s' -n 5 --graph
*   b574c15 (2021-03-23 18:28:33 +0100) (HEAD -> gha_undo_macos, origin/dev_0.5.0, dev_0.5.0) Merge pull request #125 from inbo/macos_sysdeps_conditional
|\  
| * e755404 (2021-03-22 21:09:09 +0100) Github actions, R-CMD-check-latest: conditional cache on macOS
| * a298a17 (2021-03-22 20:50:39 +0100) Github actions, R-CMD-check: macOS fix conditional sysdeps
| * 0a0d8da (2021-03-22 20:47:12 +0100) Github actions, R-CMD-check: on macOS try conditional sysdeps
|/  
*   84149e3 (2021-03-22 19:19:27 +0100) Merge pull request #124 from inbo/gha_windows_cache

$ git revert -m 1 HEAD

$ git log --format='%C(auto)%h (%ai)%d %s' -n 6 --graph
* b3b9515 (2021-03-24 09:20:20 +0100) (HEAD -> gha_undo_macos) GH actions: revert "Merge PR #125 from inbo/macos_sysdeps_conditional" *
*   b574c15 (2021-03-23 18:28:33 +0100) (origin/dev_0.5.0, dev_0.5.0) Merge pull request #125 from inbo/macos_sysdeps_conditional
|\  
| * e755404 (2021-03-22 21:09:09 +0100) Github actions, R-CMD-check-latest: conditional cache on macOS
| * a298a17 (2021-03-22 20:50:39 +0100) Github actions, R-CMD-check: macOS fix conditional sysdeps
| * 0a0d8da (2021-03-22 20:47:12 +0100) Github actions, R-CMD-check: on macOS try conditional sysdeps
|/  
*   84149e3 (2021-03-22 19:19:27 +0100) Merge pull request #124 from inbo/gha_windows_cache