Skip to content

Commit

Permalink
Try ubuntu's java
Browse files Browse the repository at this point in the history
  • Loading branch information
eigenraven committed Jul 12, 2022
1 parent ef3ef36 commit b1f96fc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
10 changes: 3 additions & 7 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,13 @@ jobs:
fetch-depth: 0

- name: Set up JDK 8
uses: actions/setup-java@v2
with:
java-version: '8'
distribution: 'adopt'
cache: gradle
run: sudo apt-get update && sudo apt-get install openjdk-8-jdk-headless && sudo update-java-alternatives -s java-1.8.0-openjdk-amd64

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Build thermos
run: ./gradlew setupCauldron jar packageBundle --info
run: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 ./gradlew setupCauldron jar packageBundle --info

- name: Upload thermos artifacts
uses: actions/upload-artifact@v3
Expand All @@ -63,7 +59,7 @@ jobs:
mkdir run
cd run
echo "eula=true" > eula.txt
timeout 90 java -Xmx1G -server -jar ../build/distributions/Thermos-1.7.10-1614.*-server.jar 2>&1 | tee -a ../server.log || true
timeout 90 /usr/lib/jvm/java-8-openjdk-amd64/bin/java -Xmx1G -server -jar ../build/distributions/Thermos-*-server.jar 2>&1 | tee -a ../server.log || true
- name: Test no errors reported during server run
run: |
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/release-tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,13 @@ jobs:
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV

- name: Set up JDK 8
uses: actions/setup-java@v2
with:
java-version: '8'
distribution: 'adopt'
cache: gradle
run: sudo apt-get update && sudo apt-get install openjdk-8-jdk-headless && sudo update-java-alternatives -s java-1.8.0-openjdk-amd64

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Build thermos
run: ./gradlew setupCauldron jar packageBundle --info
run: JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 ./gradlew setupCauldron jar packageBundle --info

- name: Release under current tag
run: gh release create "${RELEASE_VERSION}" --generate-notes ./build/distributions/*
Expand Down

0 comments on commit b1f96fc

Please sign in to comment.