Skip to content

Commit

Permalink
Merge PR #26: Move to GitHub Actions for CI
Browse files Browse the repository at this point in the history
  • Loading branch information
smarr authored Apr 11, 2021
2 parents ca93052 + 59933da commit 596b11d
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 20 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Tests

on: [push, pull_request]

jobs:
test_som:
runs-on: ubuntu-20.04 # ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: true

- name: Tests
run: |
ant test
- name: CheckStyle
run: |
ant checkstyle
- name: Download Eclipse
run: |
export ECLIPSE_TAR=eclipse.tar.gz
export ECLIPSE_URL=https://ftp.halifax.rwth-aachen.de/eclipse/eclipse/downloads/drops4/R-4.17-202009021800/eclipse-SDK-4.17-linux-gtk-x86_64.tar.gz
wget ${ECLIPSE_URL} -O ${ECLIPSE_TAR}
tar -C ${GITHUB_WORKSPACE}/.. -xzf ${ECLIPSE_TAR}
- name: Check Eclipse Format
run: |
export ECLIPSE_EXE=${GITHUB_WORKSPACE}/../eclipse/eclipse
ant eclipseformat
19 changes: 0 additions & 19 deletions .travis.yml

This file was deleted.

8 changes: 7 additions & 1 deletion src/som/vm/Universe.java
Original file line number Diff line number Diff line change
Expand Up @@ -661,9 +661,15 @@ public SClass loadClass(final SSymbol name) throws ProgramDefinitionError {
}

public void loadSystemClass(final SClass systemClass) throws ProgramDefinitionError {
// Load the system class
SClass result = loadClass(systemClass.getName(), systemClass);

if (result == null) {
throw new ProgramDefinitionError("Failed to load the "
+ systemClass.getName().getEmbeddedString() + " class."
+ " This is unexpected and may indicate that the classpath is not set correctly,"
+ " or that the core library is not available.");
}

// Load primitives if necessary
if (result.hasPrimitives()) {
result.loadPrimitives();
Expand Down

0 comments on commit 596b11d

Please sign in to comment.