Merge branch 'master' into restack

JuliaFolds · Jan 29, 2022 · 4543026 · 4543026
2 parents 6f84d81 + 3f52fa9
commit 4543026
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@latest
         with:
-          version: 1.5
+          version: 1.7
       - name: Install dependencies
         run: julia -e 'using Pkg; pkg"add PkgBenchmark BenchmarkCI@0.1"'
       - name: Run benchmarks

diff --git a/.github/workflows/multi-thread-benchmark.yml b/.github/workflows/multi-thread-benchmark.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@latest
         with:
-          version: 1.5
+          version: 1.7
       - name: Install dependencies
         run: julia -e 'using Pkg; pkg"add PkgBenchmark BenchmarkCI@0.1"'
       - name: Run benchmarks

diff --git a/.github/workflows/pkg-update.yml b/.github/workflows/pkg-update.yml
@@ -32,12 +32,12 @@ jobs:
         uses: tkf/julia-update-manifests@v1
         with:
           version: '1.4'
-          projects: test/environments/main benchmark
-      - name: Update test/environments/jl10/Manifest.toml
+          projects: test/environments/main
+      - name: Update */Manifest.toml (1.7)
         uses: tkf/julia-update-manifests@v1
         with:
-          version: '1.0'
-          projects: test/environments/jl10
+          version: '1.7'
+          projects: benchmark
 
       # https://github.com/peter-evans/create-pull-request
       # https://github.com/marketplace/actions/create-pull-request