Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,20 @@ jobs:
run: git config --global core.autocrlf input

- name: Check out IronRuby
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
path: ironruby

# The modern DLR is referenced as source projects from a sibling directory,
# and prism supplies the parser itself.
- name: Check out the DLR
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
repository: IronLanguages/dlr
path: dlr

- name: Check out prism
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
repository: ruby/prism
path: prism
Expand All @@ -86,7 +86,7 @@ jobs:

# Both runtimes are installed on every matrix entry: the SDK builds either
# target framework, but running the net8.0 output needs the .NET 8 runtime.
- uses: actions/setup-dotnet@v4
- uses: actions/setup-dotnet@v6
with:
dotnet-version: |
8.0.x
Expand All @@ -97,7 +97,7 @@ jobs:
ruby-version: '3.3'

- name: Cache NuGet packages
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: ~/.nuget/packages
key: nuget-${{ matrix.os }}-${{ hashFiles('ironruby/**/*.csproj', 'ironruby/Directory.Build.props', 'dlr/**/*.csproj') }}
Expand All @@ -109,7 +109,7 @@ jobs:

- name: Cache the prism build
id: prism-cache
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: prism/build
key: prism-${{ matrix.os }}-${{ steps.prism.outputs.sha }}
Expand Down Expand Up @@ -310,7 +310,7 @@ jobs:
# The full transcript, for looking at a failure that is inside the baseline.
- name: Keep the test output
if: always()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: ironruby-tests-${{ matrix.os }}-${{ matrix.tfm }}
path: ironruby/Src/IronRuby.Tests/bin/Debug/${{ matrix.tfm }}/results.txt
Expand All @@ -327,22 +327,22 @@ jobs:
TFM: ${{ matrix.tfm }}
IR_TFM: ${{ matrix.tfm }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
path: ironruby
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
repository: IronLanguages/dlr
path: dlr
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
repository: ruby/prism
path: prism
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
repository: ruby/spec
path: ironruby/spec
- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
repository: ruby/mspec
path: ironruby/mspec
Expand All @@ -355,7 +355,7 @@ jobs:
git -C dlr apply "../$patch"
done

- uses: actions/setup-dotnet@v4
- uses: actions/setup-dotnet@v6
with:
dotnet-version: |
8.0.x
Expand All @@ -365,7 +365,7 @@ jobs:
ruby-version: '3.3'

- name: Cache NuGet packages
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: ~/.nuget/packages
key: nuget-ubuntu-latest-${{ hashFiles('ironruby/**/*.csproj', 'ironruby/Directory.Build.props', 'dlr/**/*.csproj') }}
Expand All @@ -377,7 +377,7 @@ jobs:

- name: Cache the prism build
id: prism-cache
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: prism/build
key: prism-ubuntu-latest-${{ steps.prism.outputs.sha }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@ jobs:
if: runner.os == 'Windows'
run: git config --global core.autocrlf input

- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
path: ironruby

- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
repository: IronLanguages/dlr
path: dlr

- uses: actions/checkout@v4
- uses: actions/checkout@v7
with:
repository: ruby/prism
ref: ${{ env.PRISM_REF }}
Expand All @@ -72,7 +72,7 @@ jobs:

# The DLR multi-targets up to net9.0, so the build needs the .NET 10 SDK; the
# release itself targets net8.0.
- uses: actions/setup-dotnet@v4
- uses: actions/setup-dotnet@v6
with:
dotnet-version: |
8.0.x
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
fi
Util/package-release.sh "${{ matrix.rid }}" "$GITHUB_WORKSPACE/dist"

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v7
with:
name: ironruby-${{ matrix.rid }}
path: |
Expand All @@ -134,7 +134,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
path: dist
merge-multiple: true
Expand Down
4 changes: 4 additions & 0 deletions Src/IronRuby.Tests/DLR/ReflectionUtilsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ public virtual void PublicVirtualMethod2() { }

// fields

#pragma warning disable 169, 649 // fields for GetMembers to find by reflection; nothing reads or writes them
public static int A_PublicStaticField;
private static int A_PrivateStaticField;
protected static int A_ProtectedStaticField;
Expand All @@ -102,6 +103,7 @@ public virtual void PublicVirtualMethod2() { }
private int A_PrivateField;
protected int A_ProtectedField;
internal int A_InternalField;
#pragma warning restore 169, 649

public int PublicField;

Expand Down Expand Up @@ -181,6 +183,7 @@ internal override void InternalVirtualMethod() { }

// fields

#pragma warning disable 169, 649 // fields for GetMembers to find by reflection; nothing reads or writes them
public static int B_PublicStaticField;
private static int B_PrivateStaticField;
protected static int B_ProtectedStaticField;
Expand All @@ -190,6 +193,7 @@ internal override void InternalVirtualMethod() { }
private int B_PrivateField;
protected int B_ProtectedField;
internal int B_InternalField;
#pragma warning restore 169, 649

public new int PublicField;

Expand Down
10 changes: 2 additions & 8 deletions Src/IronRuby.Tests/Helpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,6 @@ public static List<Tokens> GetRubyTokens(RubyContext context, ErrorSink log, str
return tokens;
}

private static int domainId = 0;

private static AppDomain CreateDomain() {
return AppDomain.CreateDomain("RemoteScripts" + domainId++);
}

[Flags]
enum OutputFlags {
None = 0,
Expand Down Expand Up @@ -290,13 +284,13 @@ private void RedirectOutput(TextWriter/*!*/ output, Action f) {
f();
} else {
MemoryStream stream = new MemoryStream();
Runtime.IO.SetOutput(stream, StringUtils.DefaultEncoding);
Runtime.IO.SetOutput(stream, Encoding.Default);
Runtime.IO.SetErrorOutput(Console.OpenStandardError(), Console.Error);

try {
f();
} finally {
output.Write(StringUtils.DefaultEncoding.GetString(stream.ToArray()));
output.Write(Encoding.Default.GetString(stream.ToArray()));
Runtime.IO.RedirectToConsole();
}
}
Expand Down
2 changes: 0 additions & 2 deletions Src/IronRuby.Tests/RubyTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ public Tests(Driver/*!*/ driver) {
Interpreter_JumpFromFinally1,
Interpreter_JumpFromFinally2,
Interpreter2,
Interpreter3,
Interpreter4,
Interpreter5,
Interpreter6,
InterpreterNumeric1,
Expand Down
Loading
Loading