From bba4b955f53fdd99c906bbb21be30cf9811baa5c Mon Sep 17 00:00:00 2001
From: richardreeve <richard.reeve@glasgow.ac.uk>
Date: Sun, 21 Jul 2024 14:05:44 +0100
Subject: [PATCH] Fix workflows, compat fix

---
 .github/workflows/metadata.yaml | 11 +++--------
 .github/workflows/testing.yaml  |  7 ++++---
 Project.toml                    |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/metadata.yaml b/.github/workflows/metadata.yaml
index 2ebcf22..bb04ef1 100644
--- a/.github/workflows/metadata.yaml
+++ b/.github/workflows/metadata.yaml
@@ -9,19 +9,14 @@ on:
   pull_request:
   workflow_dispatch:
 
-concurrency:
-  # Skip intermediate builds: always.
-  # Cancel intermediate builds: only if it is a pull request build.
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+permissions: # needed to allow julia-actions/cache to proactively delete old caches that it has created
+  actions: write
+  contents: read
 
 jobs:
   metadata:
     name: RSMD - ${{ github.event_name }}
     timeout-minutes: 60
-    permissions: # needed to allow julia-actions/cache to proactively delete old caches that it has created
-      actions: write
-      contents: read
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml
index 0fb4e67..246da02 100644
--- a/.github/workflows/testing.yaml
+++ b/.github/workflows/testing.yaml
@@ -8,13 +8,14 @@ on:
       - 'v*'
   pull_request:
 
+permissions: # needed to allow julia-actions/cache to proactively delete old caches that it has created
+  actions: write
+  contents: read
+
 jobs:
   Diversity-tests:
     name: Julia ${{ matrix.julia-version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
     timeout-minutes: 60
-    permissions: # needed to allow julia-actions/cache to proactively delete old caches that it has created
-      actions: write
-      contents: read
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
     strategy:
diff --git a/Project.toml b/Project.toml
index 883493e..2cd763f 100644
--- a/Project.toml
+++ b/Project.toml
@@ -37,7 +37,7 @@ Logging = "1"
 Missings = "0.4, 1.0"
 Phylo = "0.4, 0.5"
 Pkg = "1.8"
-RCall = "0.13"
+RCall = "0.13, 0.14"
 RecipesBase = "0.6, 0.7, 0.8, 1"
 Requires = "^1"
 ResearchSoftwareMetadata = "0.1.1"