Skip to content

Commit 85aaa11

Browse files
authored
Merge pull request #106 from velexi-research/dev/0.6.4
Fix bugs in PkgEval.yml workflow.
2 parents 047f8ec + debf4c2 commit 85aaa11

File tree

6 files changed

+41
-37
lines changed

6 files changed

+41
-37
lines changed

.github/workflows/CI.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,20 @@ jobs:
4242
env:
4343
codecov-os: 'Linux'
4444
codecov-arch: x64
45-
codecov-version: '1.10'
45+
codecov-version: '1.11'
4646

4747
steps:
4848
- name: Check out code
4949
uses: actions/checkout@v4
5050

5151
- name: Set up Julia environment
52-
uses: julia-actions/setup-julia@v1
52+
uses: julia-actions/setup-julia@v2
5353
with:
5454
version: ${{ matrix.version }}
5555
arch: ${{ matrix.arch }}
5656

5757
- name: Set up Julia caches
58-
uses: julia-actions/cache@v1
58+
uses: julia-actions/cache@v2
5959
with:
6060
cache-name: ${{ github.repository }}-${{ github.workflow }}-${{ github.job }}-julia-${{ hashFiles('.github/workflows/CI.yml') }}
6161

@@ -85,7 +85,7 @@ jobs:
8585
matrix.arch == env.codecov-arch &&
8686
matrix.version == env.codecov-version
8787
88-
uses: codecov/codecov-action@v3
88+
uses: codecov/codecov-action@v5
8989
with:
9090
token: ${{ secrets.CODECOV_TOKEN }}
9191
files: lcov.info
@@ -102,9 +102,14 @@ jobs:
102102
uses: actions/checkout@v4
103103

104104
- name: Set up Julia environment
105-
uses: julia-actions/setup-julia@latest
105+
uses: julia-actions/setup-julia@v2
106106
with:
107-
version: '1.10'
107+
version: '1.11'
108+
109+
- name: Set up Julia caches
110+
uses: julia-actions/cache@v2
111+
with:
112+
cache-name: ${{ github.repository }}-${{ github.workflow }}-${{ github.job }}-julia-${{ hashFiles('.github/workflows/CI.yml') }}
108113

109114
- name: Install dependencies
110115
run: julia --project=docs --color=yes -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'

.github/workflows/CompatHelper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
run: which julia
1616
continue-on-error: true
1717
- name: Install Julia, but only if it is not already available in the PATH
18-
uses: julia-actions/setup-julia@v1
18+
uses: julia-actions/setup-julia@v2
1919
with:
2020
version: '1'
2121
arch: ${{ runner.arch }}

.github/workflows/PkgEval.yml

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: PkgEval
22
on:
3-
# push:
4-
# branches:
5-
# - main
6-
#
7-
# pull_request:
8-
# branches:
9-
# - main
3+
push:
4+
branches:
5+
- main
6+
7+
pull_request:
8+
branches:
9+
- main
1010

1111
# Allows you to run this workflow manually from the Actions tab
1212
workflow_dispatch:
@@ -20,15 +20,25 @@ jobs:
2020
fail-fast: false
2121

2222
steps:
23-
- uses: julia-actions/setup-julia@v1
23+
- name: "Allow unprivileged user namespaces"
24+
run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
25+
26+
- name: Set up Julia
27+
uses: julia-actions/setup-julia@v2
2428
with:
2529
version: '1'
2630

27-
- uses: actions/checkout@v4
31+
- name: Set up Julia caches
32+
uses: julia-actions/cache@v2
33+
with:
34+
cache-name: ${{ github.repository }}-${{ github.workflow }}-${{ github.job }}-julia-${{ hashFiles('.github/workflows/PkgEval.yml') }}
35+
36+
- name: Check out PkgEval
37+
uses: actions/checkout@v4
2838
with:
2939
repository: 'JuliaCI/PkgEval.jl'
3040

31-
- name: Instantiate PkgEval
41+
- name: Install PkgEval
3242
run: julia --project=. -e 'import Pkg; Pkg.instantiate()'
3343

3444
- name: Run PkgEval
@@ -55,7 +65,7 @@ jobs:
5565
@show package
5666
5767
println(horizontal_rule)
58-
result = PkgEval.evaluate_compiled_test(config, package; echo=true)
68+
result = PkgEval.evaluate_package(config, package; echo=true)
5969
6070
println(horizontal_rule)
6171
if !ismissing(result.version)
@@ -66,4 +76,4 @@ jobs:
6676
if !ismissing(result.reason)
6777
println("Failure reason: $(result.reason)")
6878
end
69-
exit(result.status == :ok ? 0 : 1)
79+
exit(result.status == :test && ismissing(result.reason) ? 0 : 1)

NEWS.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@ TestTools Release Notes
22
=======================
33

44
--------------------------------------------------------------------------------------------
5-
v0.6.4 (2025-02-19)
5+
v0.6.4 (2025-02-20)
66
-------------------
77
**Enhancements:**
8-
- Improve robustness of Julia environment activation between tests.
8+
- Improved robustness of Julia environment used by tests.
99

1010
**Developer Updates:**
11-
- Add Aqua.jl checks to unit tests.
12-
- Update unit tests to fixed PkgEval failures for Julia v1.12 and greater.
11+
- Added Aqua.jl checks to unit tests.
12+
- Updated unit tests to fixed failures for Julia v1.12 and greater.
13+
- Fixed permissions bug in PkgEval GitHub Actions workflow.
1314

1415
--------------------------------------------------------------------------------------------
1516
v0.6.3 (2024-06-29)
1617
-------------------
1718
**Developer Updates:**
1819
- Fixed PkgEval failures by removing external program calls from unit tests.
19-
- Add PkgEval GitHub Actions workflow.
20+
- Added PkgEval GitHub Actions workflow.
2021

2122
--------------------------------------------------------------------------------------------
2223
v0.6.2 (2024-06-26)

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<td colspan=2 align="center">
2525
<a href="https://github.com/velexi-research/TestTools.jl/issues"><img style="vertical-align: bottom;" src="https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat"/></a>
2626
<a href="https://github.com/invenia/BlueStyle"><img style="vertical-align: bottom;" src="https://img.shields.io/badge/code%20style-blue-4495d1.svg"/></a>
27+
<a href="https://github.com/JuliaTesting/Aqua.jl"><img style="vertical-align: bottom;" src="https://raw.githubusercontent.com/JuliaTesting/Aqua.jl/master/badge.svg"/></a>
2728
</td>
2829
</tr>
2930
</table>

test/runtests.jl

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Unit test runner for the TestTools package.
1919
# --- Imports
2020

2121
# Standard library
22-
using Pkg: Pkg
2322
using Test
2423

2524
# External packages
@@ -30,18 +29,6 @@ using Suppressor
3029
using TestTools
3130
using TestTools.jltest
3231

33-
#cmd = Cmd(`\$HOME/.juliaup/bin/julia --project=. -e "import Pkg"`)
34-
cmd = Cmd(`pwd`)
35-
console = @capture_out begin
36-
Base.run(cmd)
37-
end
38-
println(console)
39-
cmd = Cmd(`ls`)
40-
console = @capture_out begin
41-
Base.run(cmd)
42-
end
43-
println(console)
44-
4532
# --- Helper functions
4633

4734
function make_windows_safe_regex(s::AbstractString)

0 commit comments

Comments
 (0)