fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove xvfb steps as runData should now run headless (#4513)

Browse Source 
Also run `prepareRunData` in a separate step to avoid a race condition with ForgeGradle writing the generated dependency after it has already written it for `runData`
This commit is contained in:
yueh
2020-07-28 14:49:33 +02:00
committed by GitHub
parent 0beab559a6
commit 307a6817d4
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/branches.yml
+4 -3
View File
@@ -25,10 +25,11 @@ jobs:
run: ./gradlew clean --no-daemon
- name: Validate no assets
run: test ! -d ./src/generated
# FG does appear to read the deps in runData before it has written it. Separate step to avoid it
- name: Compile Java and prepare runData
run: ./gradlew compileJava prepareRunData --no-daemon
- name: Generate assets
uses: GabrielBB/xvfb-action@v1.2
with:
run: ./gradlew runData --no-daemon
run: ./gradlew runData --no-daemon
- name: Validate assets
run: test -d ./src/generated -a -f ./src/generated/resources/.cache/cache
- name: Build with Gradle
.github/workflows/master.yml
+4 -3
View File
@@ -25,10 +25,11 @@ jobs:
run: ./gradlew clean --no-daemon
- name: Validate no assets
run: test ! -d ./src/generated
# FG does appear to read the deps in runData before it has written it. Separate step to avoid it
- name: Compile Java and prepare runData
run: ./gradlew compileJava prepareRunData --no-daemon
- name: Generate assets
uses: GabrielBB/xvfb-action@v1.2
with:
run: ./gradlew runData --no-daemon
run: ./gradlew runData --no-daemon
- name: Validate assets
run: test -d ./src/generated -a -f ./src/generated/resources/.cache/cache
- name: Build with Gradle
.github/workflows/pull_requests.yml
+4 -3
View File
@@ -25,10 +25,11 @@ jobs:
run: ./gradlew clean --no-daemon
- name: Validate no assets
run: test ! -d ./src/generated
# FG does appear to read the deps in runData before it has written it. Separate step to avoid it
- name: Compile Java and prepare runData
run: ./gradlew compileJava prepareRunData --no-daemon
- name: Generate assets
uses: GabrielBB/xvfb-action@v1.2
with:
run: ./gradlew runData --no-daemon
run: ./gradlew runData --no-daemon
- name: Validate assets
run: test -d ./src/generated -a -f ./src/generated/resources/.cache/cache
- name: Build with Gradle
.github/workflows/release.yml
+4 -3
View File
@@ -30,10 +30,11 @@ jobs:
run: chmod +x gradlew
- name: Validate no assets
run: test ! -d ./src/generated
# FG does appear to read the deps in runData before it has written it. Separate step to avoid it
- name: Compile Java and prepare runData
run: ./gradlew compileJava prepareRunData --no-daemon
- name: Generate assets
uses: GabrielBB/xvfb-action@v1.2
with:
run: ./gradlew runData --no-daemon
run: ./gradlew runData --no-daemon
- name: Validate assets
run: test -d ./src/generated -a -f ./src/generated/resources/.cache/cache
- name: Build with Gradle