Merge branch 'master' into dependabot/github_actions/codecov/codecov-…

…action-4
JuliaInterop · Apr 4, 2024 · 72f1753 · 72f1753
2 parents c711d71 + 7037422
commit 72f1753
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,8 +39,8 @@ jobs:
             experimental: false
             R: 'release'
     steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -13,7 +13,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: r-lib/actions/setup-r@v2
         with:
           use-public-rspm: true

diff --git a/test/convert/categorical.jl b/test/convert/categorical.jl
@@ -2,7 +2,7 @@ using CategoricalArrays
 
 # CategoricalArrays
 for ord in (true, false)
-    v = CategoricalArray(repeat(["b", "a"], inner = 5), ordered=ord)
+    local v = CategoricalArray(repeat(["b", "a"], inner = 5), ordered=ord)
     v2 = rcopy(CategoricalArray, RObject(v))
     @test isequal(v2, v)
     @test v2 isa CategoricalVector{String}
@@ -16,7 +16,7 @@ end
 a = Array{Union{String, Missing}}(repeat(["b", "a"], inner = 5))
 a[repeat([true, false], outer = 5)] .= missing
 for ord in (true, false)
-    v = CategoricalArray(a, ordered=ord)
+    local v = CategoricalArray(a, ordered=ord)
     v2 = rcopy(CategoricalArray, RObject(v))
     @test isequal(v2, v)
     @test v2 isa CategoricalVector{Union{String,Missing}}