Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into game-start-snappy-5
Browse files Browse the repository at this point in the history
  • Loading branch information
skaldarnar committed Oct 9, 2020
2 parents 55c74d5 + 8065ef6 commit aa70a8b
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 4 deletions.
18 changes: 14 additions & 4 deletions .github/workflows/push-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,22 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 14
- name: Set up JDK 15
uses: actions/setup-java@v1
with:
java-version: 14
java-version: 15
java-package: jdk
- name: Build and test with Gradle
- name: Cache Gradle packages
uses: actions/cache@v2
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle
- name: Build
run: ./gradlew jar
- name: Test
env:
JAVA_TOOL_OPTIONS: -Dtestfx.robot=glass -Dtestfx.headless=true -Dprism.verbose=true
run: ./gradlew check
run: ./gradlew test
- name: Static Code Analysis
run: ./gradlew check -x test
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ test {
}

checkstyle {
ignoreFailures = false
configFile = new File("$rootDir/config/metrics/checkstyle/checkstyle.xml")
configProperties.samedir = checkstyle.configFile.parentFile
}
Expand Down
16 changes: 16 additions & 0 deletions src/main/java/org/terasology/launcher/gui/javafx/Effects.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright 2020 MovingBlocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.terasology.launcher.gui.javafx;

import javafx.animation.ScaleTransition;
Expand Down

0 comments on commit aa70a8b

Please sign in to comment.