From 32d933eff3498b9628817fbadb54c27ed17f670b Mon Sep 17 00:00:00 2001 From: Vineet Bansal <vineetbansal@protonmail.com> Date: Wed, 13 Mar 2024 17:02:06 -0400 Subject: [PATCH 1/5] ci debugging --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dde85f8..e5f5a2e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest ] - R: [ '4.1.0', '4.1.1' ] + R: [ '4.1.0', '4.1.1', '4.2.0', '4.2.1'] fail-fast: false runs-on: ${{ matrix.os }} name: R ${{ matrix.R }} ${{ matrix.os }} @@ -24,7 +24,7 @@ jobs: r-version: ${{ matrix.R }} - name: Install system dependencies - run: sudo apt install build-essential libxml2-dev libssl-dev texinfo texlive-latex-base libcurl4-openssl-dev libcairo2-dev texlive-fonts-extra qpdf + run: sudo apt install build-essential libxml2-dev libssl-dev texinfo texlive-latex-base libcurl4-openssl-dev libcairo2-dev texlive-fonts-extra qpdf libharfbuzz-dev libfribidi-dev - name: Install devtools run: Rscript -e "install.packages('devtools', dependencies=T, repos='https://cloud.r-project.org')" From 9bc7a120db7438085483c0df70a7cd7e6bde5f48 Mon Sep 17 00:00:00 2001 From: Vineet Bansal <vineetbansal@protonmail.com> Date: Wed, 3 Apr 2024 17:26:42 -0400 Subject: [PATCH 2/5] putting ceiling on XML version to avoid compilation on Windows CI --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 2a2ad0f..6a89f1b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -24,7 +24,7 @@ Imports: curl, stats, utils, - XML + XML (<= 3.99-0.14) RoxygenNote: 7.1.2 Suggests: testthat (>= 2.1.0), From 858b5d8c46b24503bf5b42283f941fc82c5cd9df Mon Sep 17 00:00:00 2001 From: Vineet Bansal <vineetb@princeton.edu> Date: Sat, 6 Apr 2024 10:19:20 -0400 Subject: [PATCH 3/5] let setup-r decide on R version --- .github/workflows/main.yml | 13 +++---------- DESCRIPTION | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e5f5a2e..ca391cb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,17 +11,14 @@ jobs: strategy: matrix: os: [ ubuntu-latest ] - R: [ '4.1.0', '4.1.1', '4.2.0', '4.2.1'] fail-fast: false runs-on: ${{ matrix.os }} - name: R ${{ matrix.R }} ${{ matrix.os }} steps: - uses: actions/checkout@v2 + - name: Setup R uses: r-lib/actions/setup-r@v2 - with: - r-version: ${{ matrix.R }} - name: Install system dependencies run: sudo apt install build-essential libxml2-dev libssl-dev texinfo texlive-latex-base libcurl4-openssl-dev libcairo2-dev texlive-fonts-extra qpdf libharfbuzz-dev libfribidi-dev @@ -42,14 +39,12 @@ jobs: R: [ '4.1.0', '4.1.1' ] fail-fast: false runs-on: ${{ matrix.os }} - name: R ${{ matrix.R }} ${{ matrix.os }} steps: - uses: actions/checkout@master + - name: Setup R uses: r-lib/actions/setup-r@v2 - with: - r-version: ${{ matrix.R }} - name: Install Homebrew if: false @@ -75,14 +70,12 @@ jobs: R: [ '4.1.0', '4.1.1' ] fail-fast: false runs-on: ${{ matrix.os }} - name: R ${{ matrix.R }} ${{ matrix.os }} steps: - uses: actions/checkout@master + - name: Setup R uses: r-lib/actions/setup-r@v2 - with: - r-version: ${{ matrix.R }} - name: Install MikTex if: false diff --git a/DESCRIPTION b/DESCRIPTION index 6a89f1b..2a2ad0f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -24,7 +24,7 @@ Imports: curl, stats, utils, - XML (<= 3.99-0.14) + XML RoxygenNote: 7.1.2 Suggests: testthat (>= 2.1.0), From 26f0d2c1fbb59d0c4857d4465d827a8122becd3c Mon Sep 17 00:00:00 2001 From: Vineet Bansal <vineetb@princeton.edu> Date: Sat, 6 Apr 2024 10:23:26 -0400 Subject: [PATCH 4/5] remove R from matrix --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ca391cb..8eaabf3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,7 +36,6 @@ jobs: strategy: matrix: os: [ macOS-latest ] - R: [ '4.1.0', '4.1.1' ] fail-fast: false runs-on: ${{ matrix.os }} @@ -67,7 +66,6 @@ jobs: strategy: matrix: os: [ windows-latest ] - R: [ '4.1.0', '4.1.1' ] fail-fast: false runs-on: ${{ matrix.os }} From 10cbdd5dfd03824ce49e37dce826b499098adc6c Mon Sep 17 00:00:00 2001 From: Vineet Bansal <vineetbansal@protonmail.com> Date: Sat, 6 Apr 2024 10:42:44 -0400 Subject: [PATCH 5/5] version bump --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 2a2ad0f..24f525e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: pyMTurkR Type: Package Title: A Client for the 'MTurk' Requester API -Version: 1.1.5 +Version: 1.1.6 Authors@R: c(person("Tyler", "Burleigh", role = "aut", email = "tylerburleigh@gmail.com",