Skip to content

Commit 5f3f4ca

Browse files
committed
Clean up unneeded changes
1 parent 7e40283 commit 5f3f4ca

File tree

2 files changed

+11
-19
lines changed

2 files changed

+11
-19
lines changed

.github/workflows/main.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,22 @@ on:
5353
- v3.3
5454
pull_request:
5555
release:
56-
types: [ published ]
56+
types: [published]
5757

5858
jobs:
5959
ScreenshotTests:
6060
name: Run Screenshot Tests
6161
runs-on: ubuntu-latest
6262
permissions:
6363
contents: read
64-
pull-requests: write
6564
steps:
6665
- uses: actions/checkout@v4
6766
- name: Set up JDK 17
6867
uses: actions/setup-java@v4
6968
with:
7069
java-version: '17'
7170
distribution: 'temurin'
72-
- name: Install Mesa3D and OpenCL
71+
- name: Install Mesa3D
7372
run: |
7473
sudo apt-get update
7574
sudo apt-get install -y mesa-utils libgl1-mesa-dri libgl1 libglx-mesa0 xvfb
@@ -127,14 +126,14 @@ jobs:
127126

128127
# Build the engine, we only deploy from ubuntu-latest jdk21
129128
BuildJMonkey:
130-
needs: [ BuildAndroidNatives ]
129+
needs: [BuildAndroidNatives]
131130
name: Build on ${{ matrix.osName }} jdk${{ matrix.jdk }}
132131
runs-on: ${{ matrix.os }}
133132
strategy:
134133
fail-fast: false
135134
matrix:
136-
os: [ ubuntu-latest,windows-latest,macOS-latest ]
137-
jdk: [ 11, 17, 21 ]
135+
os: [ubuntu-latest,windows-latest,macOS-latest]
136+
jdk: [11, 17, 21]
138137
include:
139138
- os: ubuntu-latest
140139
osName: linux
@@ -230,7 +229,7 @@ jobs:
230229
path: dist/maven
231230

232231
- name: Upload javadoc
233-
if: matrix.deploy==true
232+
if: matrix.deploy==true
234233
uses: actions/upload-artifact@master
235234
with:
236235
name: javadoc
@@ -249,7 +248,7 @@ jobs:
249248
# this is useful for people that want to build only the java part and don't have
250249
# all the stuff needed to compile natives.
251250
DeployNativeSnapshot:
252-
needs: [ BuildJMonkey ]
251+
needs: [BuildJMonkey]
253252
name: "Deploy native snapshot"
254253
runs-on: ubuntu-latest
255254
if: github.event_name == 'push'
@@ -335,7 +334,7 @@ jobs:
335334
336335
# This job deploys snapshots on the master branch
337336
DeployJavaSnapshot:
338-
needs: [ BuildJMonkey ]
337+
needs: [BuildJMonkey]
339338
name: Deploy Java Snapshot
340339
runs-on: ubuntu-latest
341340
if: github.event_name == 'push' && github.ref_name == 'master'
@@ -379,7 +378,7 @@ jobs:
379378
380379
# This job deploys the release
381380
DeployRelease:
382-
needs: [ BuildJMonkey ]
381+
needs: [BuildJMonkey]
383382
name: Deploy Release
384383
runs-on: ubuntu-latest
385384
if: github.event_name == 'release'
@@ -460,7 +459,7 @@ jobs:
460459
461460
# Deploy the javadoc
462461
DeployJavaDoc:
463-
needs: [ BuildJMonkey ]
462+
needs: [BuildJMonkey]
464463
name: Deploy Javadoc
465464
runs-on: ubuntu-latest
466465
if: github.event_name == 'release'

jme3-screenshot-tests/src/main/java/org/jmonkeyengine/screenshottests/testframework/ScreenshotTest.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ public class ScreenshotTest{
4949

5050
AppState[] states;
5151

52-
boolean withOpenClSupport;
53-
5452
List<Integer> framesToTakeScreenshotsOn = new ArrayList<>();
5553

5654
TestResolution resolution = new TestResolution(500, 400);
@@ -71,11 +69,6 @@ public ScreenshotTest setFramesToTakeScreenshotsOn(Integer... frames){
7169
return this;
7270
}
7371

74-
public ScreenshotTest withOpenCLSupport(){
75-
withOpenClSupport = true;
76-
return this;
77-
}
78-
7972
/**
8073
* Sets the test type (i.e. what the pass/fail rules are for the test
8174
*/
@@ -104,7 +97,7 @@ public void run(){
10497
settings.setResolution(resolution.getWidth(), resolution.getHeight());
10598
settings.setAudioRenderer(null); // Disable audio (for headless)
10699
settings.setUseInput(false); //while it will run with inputs on it causes non-fatal errors.
107-
settings.setOpenCLSupport(withOpenClSupport);
100+
108101
String imageFilePrefix = baseImageFileName == null ? calculateImageFilePrefix() : baseImageFileName;
109102

110103
TestDriver.bootAppForTest(testType,settings,imageFilePrefix, framesToTakeScreenshotsOn, states);

0 commit comments

Comments
 (0)