From f6c39f47ec0dd182882b414bff8f554f1e02313f Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 11:04:37 +0100 Subject: [PATCH 01/34] Create setup.yml demo --- .github/workflows/setup.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/setup.yml diff --git a/.github/workflows/setup.yml b/.github/workflows/setup.yml new file mode 100644 index 00000000..e9dbf065 --- /dev/null +++ b/.github/workflows/setup.yml @@ -0,0 +1,32 @@ +# This is a basic workflow that is manually triggered + +name: Setup OS tests + +# Controls when the action will run. Workflow runs when manually triggered using the UI +# or API. +on: + workflow_dispatch: + # Inputs the workflow accepts. + inputs: + name: + # Friendly description to be shown in the UI instead of 'name' + description: 'Person to greet' + # Default value if no value is explicitly provided + default: 'World' + # Input has to be provided for the workflow to run + required: true + # The data type of the input + type: string + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "greet" + greet: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Runs a single command using the runners shell + - name: Send greeting + run: echo "Hello ${{ inputs.name }}" From 929f5516888adf192f22c03ae9c3074024eb9ee8 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 11:21:41 +0100 Subject: [PATCH 02/34] Update setup.yml --- .github/workflows/setup.yml | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/.github/workflows/setup.yml b/.github/workflows/setup.yml index e9dbf065..633578ae 100644 --- a/.github/workflows/setup.yml +++ b/.github/workflows/setup.yml @@ -7,26 +7,16 @@ name: Setup OS tests on: workflow_dispatch: # Inputs the workflow accepts. - inputs: - name: - # Friendly description to be shown in the UI instead of 'name' - description: 'Person to greet' - # Default value if no value is explicitly provided - default: 'World' - # Input has to be provided for the workflow to run - required: true - # The data type of the input - type: string - + # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - # This workflow contains a single job called "greet" - greet: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job + example_matrix: + strategy: + matrix: + version: [10, 12] steps: - # Runs a single command using the runners shell - - name: Send greeting - run: echo "Hello ${{ inputs.name }}" + - uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.version }} + + From 97cdd11760d2181576f0c23019f1aaaf8bb0a6f9 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 11:25:51 +0100 Subject: [PATCH 03/34] Update setup.yml --- .github/workflows/setup.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/setup.yml b/.github/workflows/setup.yml index 633578ae..f79eb095 100644 --- a/.github/workflows/setup.yml +++ b/.github/workflows/setup.yml @@ -11,6 +11,7 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: example_matrix: + runs-on: ubuntu-latest strategy: matrix: version: [10, 12] From 0fc586ae088076c3c9d6e284822be9f73345d0bf Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 11:32:05 +0100 Subject: [PATCH 04/34] Update setup.yml --- .github/workflows/setup.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/setup.yml b/.github/workflows/setup.yml index f79eb095..91015d48 100644 --- a/.github/workflows/setup.yml +++ b/.github/workflows/setup.yml @@ -10,14 +10,14 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - example_matrix: - runs-on: ubuntu-latest + installation_setup: + runs-on: ${{matrix.os}} strategy: matrix: - version: [10, 12] + os: [ubuntu-latest, macos-latest] steps: - - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.version }} + - name: say hello + shell: bash + run: echo "HELLO" From 65a6bc38e9d9738a1b93c40793b9949104724a90 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 11:48:26 +0100 Subject: [PATCH 05/34] Update setup.yml --- .github/workflows/setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/setup.yml b/.github/workflows/setup.yml index 91015d48..2ec8178d 100644 --- a/.github/workflows/setup.yml +++ b/.github/workflows/setup.yml @@ -14,7 +14,7 @@ jobs: runs-on: ${{matrix.os}} strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-latest] steps: - name: say hello shell: bash From 8e46e14e8d4174775915c7519ef258d3f5ffb183 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 11:52:13 +0100 Subject: [PATCH 06/34] Update setup.yml --- .github/workflows/setup.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/setup.yml b/.github/workflows/setup.yml index 2ec8178d..583dd49b 100644 --- a/.github/workflows/setup.yml +++ b/.github/workflows/setup.yml @@ -1,23 +1,21 @@ -# This is a basic workflow that is manually triggered +# A workflow for testing the workshop setup in different operating systems name: Setup OS tests # Controls when the action will run. Workflow runs when manually triggered using the UI -# or API. on: workflow_dispatch: - # Inputs the workflow accepts. -# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: installation_setup: runs-on: ${{matrix.os}} strategy: matrix: + # list of Os's os: [ubuntu-latest, windows-latest, macos-latest] steps: + # set up steps - name: say hello shell: bash run: echo "HELLO" - From 1aa1ee0bb618da5cb95f2952effb4175bd355861 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 17:27:06 +0100 Subject: [PATCH 07/34] Update and rename setup.yml to workshop-setup.yml --- .../{setup.yml => workshop-setup.yml} | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) rename .github/workflows/{setup.yml => workshop-setup.yml} (54%) diff --git a/.github/workflows/setup.yml b/.github/workflows/workshop-setup.yml similarity index 54% rename from .github/workflows/setup.yml rename to .github/workflows/workshop-setup.yml index 583dd49b..8b0794ce 100644 --- a/.github/workflows/setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -1,21 +1,23 @@ # A workflow for testing the workshop setup in different operating systems -name: Setup OS tests +name: Test Workshop Setup OS # Controls when the action will run. Workflow runs when manually triggered using the UI on: workflow_dispatch: jobs: - installation_setup: + workshop_setup: runs-on: ${{matrix.os}} strategy: matrix: - # list of Os's + # list of Os's + R: ['4.3.3'] os: [ubuntu-latest, windows-latest, macos-latest] steps: - # set up steps - - name: say hello - shell: bash - run: echo "HELLO" - + - uses: actions/checkout@v4 + - name: Setup R + uses: r-lib/actions/setup-r@v2 + with: + r-version: ${{matrix.R}} + - run: Rscript -e 'print{"hello"}' From a7adb7e226632e279016690946d76aee180de23f Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 17:30:42 +0100 Subject: [PATCH 08/34] Update workshop-setup.yml --- .github/workflows/workshop-setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index 8b0794ce..14841430 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -20,4 +20,4 @@ jobs: uses: r-lib/actions/setup-r@v2 with: r-version: ${{matrix.R}} - - run: Rscript -e 'print{"hello"}' + - run: Rscript -e 'print("hello")' From dfbeafd0652a37b49831f5738592d00e30c07dee Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 17:37:22 +0100 Subject: [PATCH 09/34] include specific fersion of rtools --- .github/workflows/workshop-setup.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index 14841430..bd34d223 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -20,4 +20,5 @@ jobs: uses: r-lib/actions/setup-r@v2 with: r-version: ${{matrix.R}} + rtools-version: '4.3.x' - run: Rscript -e 'print("hello")' From 1a9f9704aa87284308b945a0609e2345a813cc5f Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 17:50:49 +0100 Subject: [PATCH 10/34] Update workshop-setup.yml --- .github/workflows/workshop-setup.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index bd34d223..2ffa189b 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -22,3 +22,9 @@ jobs: r-version: ${{matrix.R}} rtools-version: '4.3.x' - run: Rscript -e 'print("hello")' + - name: Install GDAL, GEOS, and PROJ.4 + if: matrix.os == 'macos-latest' + run: | + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + shell: bash + From 183a832005e4b8b65a15ca918b7fff79fd8666c9 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 17:53:05 +0100 Subject: [PATCH 11/34] Update workshop-setup.yml --- .github/workflows/workshop-setup.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index 2ffa189b..f194d1b8 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -24,7 +24,6 @@ jobs: - run: Rscript -e 'print("hello")' - name: Install GDAL, GEOS, and PROJ.4 if: matrix.os == 'macos-latest' - run: | - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" shell: bash From 3dc78631c80bb744109ec9fdb3779ca5a8a7ee2d Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 18:25:45 +0100 Subject: [PATCH 12/34] Update workshop-setup.yml --- .github/workflows/workshop-setup.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index f194d1b8..33f1374b 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -24,6 +24,26 @@ jobs: - run: Rscript -e 'print("hello")' - name: Install GDAL, GEOS, and PROJ.4 if: matrix.os == 'macos-latest' - run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + run: | + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + brew tap osgeo/osgeo4mac && brew tap --repair + brew install proj + brew install geos + brew install gdal shell: bash + - name: Install GDAL, GEOS, and PROJ.4 + if: matrix.os == 'ubuntu-latest' + run: | + add-apt-repository ppa:ubuntugis + apt-get update + apt-get install libgdal-dev libgeos-dev libproj-dev + shell: bash + # Include Fedora and Arch? + - name: UDUNITS + if: matrix.os == 'ubuntu-latest' + run: | + apt-get install libudunits2-dev + shell: bash + + From dc9100ad1c53b3b2b78187c396f5ce062c179206 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 18:32:02 +0100 Subject: [PATCH 13/34] Update workshop-setup.yml --- .github/workflows/workshop-setup.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index 33f1374b..1e0b235d 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -34,15 +34,15 @@ jobs: - name: Install GDAL, GEOS, and PROJ.4 if: matrix.os == 'ubuntu-latest' run: | - add-apt-repository ppa:ubuntugis + add-apt-repository ppa:ubuntugis -y apt-get update - apt-get install libgdal-dev libgeos-dev libproj-dev + apt-get install libgdal-dev libgeos-dev libproj-dev -y shell: bash # Include Fedora and Arch? - name: UDUNITS if: matrix.os == 'ubuntu-latest' run: | - apt-get install libudunits2-dev + apt-get install libudunits2-dev -y shell: bash From ebc8dbb269beb568ab3660f196448adf2206aabe Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 18:34:20 +0100 Subject: [PATCH 14/34] Update workshop-setup.yml --- .github/workflows/workshop-setup.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index 1e0b235d..cd62eb03 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -34,15 +34,15 @@ jobs: - name: Install GDAL, GEOS, and PROJ.4 if: matrix.os == 'ubuntu-latest' run: | - add-apt-repository ppa:ubuntugis -y - apt-get update - apt-get install libgdal-dev libgeos-dev libproj-dev -y + sudo add-apt-repository ppa:ubuntugis -y + sudo apt-get update + sudo apt-get install libgdal-dev libgeos-dev libproj-dev -y shell: bash # Include Fedora and Arch? - name: UDUNITS if: matrix.os == 'ubuntu-latest' run: | - apt-get install libudunits2-dev -y + sudo apt-get install libudunits2-dev -y shell: bash From 534848dbd63d6973617d7a44f2c86049fc72bd3d Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 18:59:20 +0100 Subject: [PATCH 15/34] add R dependencies to workshop-setup.yml --- .github/workflows/workshop-setup.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index cd62eb03..a2f160ab 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -21,6 +21,13 @@ jobs: with: r-version: ${{matrix.R}} rtools-version: '4.3.x' + - uses: r-lib/actions/setup-r-dependencies@v2 + with: + cache-version: 1 + extra-packages: | + any::tidyverse + any::terra + any:sf - run: Rscript -e 'print("hello")' - name: Install GDAL, GEOS, and PROJ.4 if: matrix.os == 'macos-latest' @@ -45,5 +52,3 @@ jobs: sudo apt-get install libudunits2-dev -y shell: bash - - From 13e2ba50f4e4ee5bffc958489e1ba455d0bfd6ae Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 19:00:09 +0100 Subject: [PATCH 16/34] Update workshop-setup.yml --- .github/workflows/workshop-setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index a2f160ab..44301970 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -1,6 +1,6 @@ # A workflow for testing the workshop setup in different operating systems -name: Test Workshop Setup OS +name: Test Workshop Setup # Controls when the action will run. Workflow runs when manually triggered using the UI on: From 207b6ea07e58bd30d9dfec922b984d7cabc6cc03 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 19:05:53 +0100 Subject: [PATCH 17/34] Update workshop-setup.yml --- .github/workflows/workshop-setup.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index 44301970..60fe4e78 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -15,14 +15,13 @@ jobs: R: ['4.3.3'] os: [ubuntu-latest, windows-latest, macos-latest] steps: - - uses: actions/checkout@v4 - name: Setup R - uses: r-lib/actions/setup-r@v2 + - uses: actions/checkout@v4 + - uses: r-lib/actions/setup-r@v2 + - uses: r-lib/actions/setup-r-dependencies@v2 with: r-version: ${{matrix.R}} rtools-version: '4.3.x' - - uses: r-lib/actions/setup-r-dependencies@v2 - with: cache-version: 1 extra-packages: | any::tidyverse From 229dd16ac8c9e302128f40105aa31ffde66eccda Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 19:12:55 +0100 Subject: [PATCH 18/34] Update workshop-setup.yml --- .github/workflows/workshop-setup.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index 60fe4e78..4629533d 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -18,10 +18,11 @@ jobs: - name: Setup R - uses: actions/checkout@v4 - uses: r-lib/actions/setup-r@v2 - - uses: r-lib/actions/setup-r-dependencies@v2 with: r-version: ${{matrix.R}} rtools-version: '4.3.x' + - uses: r-lib/actions/setup-r-dependencies@v2 + with: cache-version: 1 extra-packages: | any::tidyverse From 66a8a6e263e2a90cf1af00f42068fddfb988e960 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 19:18:09 +0100 Subject: [PATCH 19/34] Update workshop-setup.yml --- .github/workflows/workshop-setup.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index 4629533d..268ca9dc 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -21,13 +21,6 @@ jobs: with: r-version: ${{matrix.R}} rtools-version: '4.3.x' - - uses: r-lib/actions/setup-r-dependencies@v2 - with: - cache-version: 1 - extra-packages: | - any::tidyverse - any::terra - any:sf - run: Rscript -e 'print("hello")' - name: Install GDAL, GEOS, and PROJ.4 if: matrix.os == 'macos-latest' @@ -51,4 +44,11 @@ jobs: run: | sudo apt-get install libudunits2-dev -y shell: bash - + - name: Geospatial Packages + - uses: r-lib/actions/setup-r-dependencies@v2 + with: + cache-version: 1 + extra-packages: | + any::tidyverse + any::terra + any:sf From 9c59bbe59c08189493af887e181e616d14b09423 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 18:35:38 +0000 Subject: [PATCH 20/34] update syntax of workflow --- .github/workflows/workshop-setup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index 268ca9dc..f03d9254 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -16,7 +16,7 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] steps: - name: Setup R - - uses: actions/checkout@v4 + uses: actions/checkout@v4 - uses: r-lib/actions/setup-r@v2 with: r-version: ${{matrix.R}} @@ -45,7 +45,7 @@ jobs: sudo apt-get install libudunits2-dev -y shell: bash - name: Geospatial Packages - - uses: r-lib/actions/setup-r-dependencies@v2 + uses: r-lib/actions/setup-r-dependencies@v2 with: cache-version: 1 extra-packages: | From 8605712ccfa16466de17dfeb119376c418ec2141 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 19:42:42 +0100 Subject: [PATCH 21/34] exclude sf package --- .github/workflows/workshop-setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index f03d9254..9c89ff33 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -51,4 +51,4 @@ jobs: extra-packages: | any::tidyverse any::terra - any:sf + From 4d31c9e23864d757448dd0126905c7f71c1d6f58 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 19:52:38 +0100 Subject: [PATCH 22/34] Update workshop-setup.yml --- .github/workflows/workshop-setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index 9c89ff33..a1519fe2 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -13,7 +13,7 @@ jobs: matrix: # list of Os's R: ['4.3.3'] - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest] steps: - name: Setup R uses: actions/checkout@v4 From d574f3cc243c30a9115c6b081bd915de0b3b65c8 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 20:07:57 +0100 Subject: [PATCH 23/34] Update geospatial package in workshop setup workflow --- .github/workflows/workshop-setup.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index a1519fe2..09ed25c2 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -47,8 +47,7 @@ jobs: - name: Geospatial Packages uses: r-lib/actions/setup-r-dependencies@v2 with: - cache-version: 1 + cache-version: 2 extra-packages: | - any::tidyverse - any::terra + any::ggplot2 From 3dcd734efcebac0e871f070efe9076a0369ad2ee Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 20:20:34 +0100 Subject: [PATCH 24/34] Add testpackage DESCRIPTION file --- DESCRIPTION | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 DESCRIPTION diff --git a/DESCRIPTION b/DESCRIPTION new file mode 100644 index 00000000..d2ec169b --- /dev/null +++ b/DESCRIPTION @@ -0,0 +1,13 @@ +Package: testpackage +Title: A Simple Test Description File to Test Packages +Version: 1.0.0 +Authors@R: + c(person(given = "Jim", + family = "Hester", + role = c("aut", "cre"), + email = "james.hester@rstudio.com")) +Description: This is a simple package used to test the workflow files. +Imports: xml2, curl +Suggests: covr, knitr, rmarkdown, testthat +License: GPL (>= 2) +VignetteBuilder: knitr, rmarkdown From be9d15e5660623a0037cc56bfe54c58fce67e1a6 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 20:24:54 +0100 Subject: [PATCH 25/34] Add new R packages for workshop setup --- .github/workflows/workshop-setup.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index 09ed25c2..e57161b3 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -48,6 +48,9 @@ jobs: uses: r-lib/actions/setup-r-dependencies@v2 with: cache-version: 2 - extra-packages: | - any::ggplot2 + packages: | + any::infosession + any::tidyverse + any::terra + any::sf From 31812b5b0cb2fdbfc135f035cc1e0bcc4d4df492 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 20:25:29 +0100 Subject: [PATCH 26/34] Delete DESCRIPTION file --- DESCRIPTION | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 DESCRIPTION diff --git a/DESCRIPTION b/DESCRIPTION deleted file mode 100644 index d2ec169b..00000000 --- a/DESCRIPTION +++ /dev/null @@ -1,13 +0,0 @@ -Package: testpackage -Title: A Simple Test Description File to Test Packages -Version: 1.0.0 -Authors@R: - c(person(given = "Jim", - family = "Hester", - role = c("aut", "cre"), - email = "james.hester@rstudio.com")) -Description: This is a simple package used to test the workflow files. -Imports: xml2, curl -Suggests: covr, knitr, rmarkdown, testthat -License: GPL (>= 2) -VignetteBuilder: knitr, rmarkdown From 84d7f682b64b9e7465f97aab600ccb44b0c02d79 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 20:28:09 +0100 Subject: [PATCH 27/34] Update package name in workshop-setup.yml --- .github/workflows/workshop-setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index e57161b3..549de6de 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -49,7 +49,7 @@ jobs: with: cache-version: 2 packages: | - any::infosession + any::sessioninfo any::tidyverse any::terra any::sf From a2732bb113b251e0d2e8e1c621a068b5483b36c1 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Mon, 18 Mar 2024 23:02:28 +0100 Subject: [PATCH 28/34] Update workshop-setup.yml --- .github/workflows/workshop-setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index 549de6de..94f8f113 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -13,7 +13,7 @@ jobs: matrix: # list of Os's R: ['4.3.3'] - os: [ubuntu-latest] + os: [ubuntu-latest, windows-latest, macos-latest] steps: - name: Setup R uses: actions/checkout@v4 From 05bcd00909ebd8c9fa885ce7730b369659e7371b Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Sat, 23 Mar 2024 10:44:08 +0100 Subject: [PATCH 29/34] windows only --- .github/workflows/workshop-setup.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index 549de6de..17f98694 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -13,14 +13,14 @@ jobs: matrix: # list of Os's R: ['4.3.3'] - os: [ubuntu-latest] + os: [windows-latest] steps: - name: Setup R uses: actions/checkout@v4 - uses: r-lib/actions/setup-r@v2 with: r-version: ${{matrix.R}} - rtools-version: '4.3.x' + rtools-version: '4.3' - run: Rscript -e 'print("hello")' - name: Install GDAL, GEOS, and PROJ.4 if: matrix.os == 'macos-latest' @@ -52,5 +52,4 @@ jobs: any::sessioninfo any::tidyverse any::terra - any::sf - + any::sf \ No newline at end of file From 682d14d6190a928c970d72b1f534f6d4a1d8b9f4 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Sat, 23 Mar 2024 10:56:20 +0100 Subject: [PATCH 30/34] correct version in rtools-version option --- .github/workflows/workshop-setup.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index 17f98694..5e5ecf3f 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -15,13 +15,13 @@ jobs: R: ['4.3.3'] os: [windows-latest] steps: + - uses: actions/checkout@v4 - name: Setup R - uses: actions/checkout@v4 - - uses: r-lib/actions/setup-r@v2 + uses: r-lib/actions/setup-r@v2 with: r-version: ${{matrix.R}} - rtools-version: '4.3' - - run: Rscript -e 'print("hello")' + rtools-version: '43' + - run: Rscript -e 'print("R was installed successfully")' - name: Install GDAL, GEOS, and PROJ.4 if: matrix.os == 'macos-latest' run: | From 8a084710e7a85a6997f93887fcbc90481c6051bd Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Sat, 23 Mar 2024 11:00:29 +0100 Subject: [PATCH 31/34] include ubuntu and macos in workflow --- .github/workflows/workshop-setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index 5e5ecf3f..f416ae6d 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -13,7 +13,7 @@ jobs: matrix: # list of Os's R: ['4.3.3'] - os: [windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v4 - name: Setup R From 55e91e50bd1e4a8893be6f04f4c811e0ed77561a Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Sat, 23 Mar 2024 11:10:15 +0100 Subject: [PATCH 32/34] include brew update command to fix error with brew link --- .github/workflows/workshop-setup.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index f416ae6d..1affff8a 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -26,6 +26,7 @@ jobs: if: matrix.os == 'macos-latest' run: | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + brew update brew tap osgeo/osgeo4mac && brew tap --repair brew install proj brew install geos @@ -52,4 +53,8 @@ jobs: any::sessioninfo any::tidyverse any::terra - any::sf \ No newline at end of file + any::sf + - name: Test Lessons + run: | + echo "code to test lessons" + shell: bash From 6678144d3e00bb483e37e723ef5b641ae062362d Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Sat, 23 Mar 2024 11:25:35 +0100 Subject: [PATCH 33/34] change name of steps for macos and ubuntu --- .github/workflows/workshop-setup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index 1affff8a..7060e4d3 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -22,7 +22,7 @@ jobs: r-version: ${{matrix.R}} rtools-version: '43' - run: Rscript -e 'print("R was installed successfully")' - - name: Install GDAL, GEOS, and PROJ.4 + - name: Install GDAL, GEOS, and PROJ.4 (macOS) if: matrix.os == 'macos-latest' run: | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" @@ -32,7 +32,7 @@ jobs: brew install geos brew install gdal shell: bash - - name: Install GDAL, GEOS, and PROJ.4 + - name: Install GDAL, GEOS, and PROJ.4 (Ubuntu) if: matrix.os == 'ubuntu-latest' run: | sudo add-apt-repository ppa:ubuntugis -y From c4411077dc8263b3fdac412ee159123144e0ab35 Mon Sep 17 00:00:00 2001 From: Manuel Garcia Date: Thu, 2 May 2024 17:27:04 +0200 Subject: [PATCH 34/34] Update .github/workflows/workshop-setup.yml Co-authored-by: Claudiu Forgaci <33600128+cforgaci@users.noreply.github.com> --- .github/workflows/workshop-setup.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/workshop-setup.yml b/.github/workflows/workshop-setup.yml index 7060e4d3..5b74d92f 100644 --- a/.github/workflows/workshop-setup.yml +++ b/.github/workflows/workshop-setup.yml @@ -56,5 +56,4 @@ jobs: any::sf - name: Test Lessons run: | - echo "code to test lessons" - shell: bash + Rscript -e 'nc <- sf::st_read(system.file("shape/nc.shp", package="sf"), quiet = TRUE); if (sf::st_crs(sf::st_transform(nc, 4326))$epsg == 4326) print("`sf` works as expected"); if (nrow(dplyr::filter(nc, AREA > 0.2)) == 11) print("`tidyverse` works as expected")'