Skip to content

Commit

Permalink
fix: Attempt to update workflows to build 1.16.5
Browse files Browse the repository at this point in the history
Workflow actions tend to get outdated after we end suuport.

Fixes #4007

Signed-off-by: Gabriel Harris-Rouquette <[email protected]>
  • Loading branch information
gabizou committed May 13, 2024
1 parent 13af9aa commit 5192fb5
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 29 deletions.
31 changes: 18 additions & 13 deletions .github/workflows/build-project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
if: "${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}"
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand All @@ -34,12 +34,12 @@ jobs:
restore-keys: |
${{ runner.os }}-minecraft-${{ env.CACHE_REV }}-
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1
uses: gradle/actions/wrapper-validation@v3
- name: Setup workspace
run: |
echo "GIT_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
Expand All @@ -49,7 +49,7 @@ jobs:
env:
CI_SYSTEM: Github Actions
- name: Archive artifacts for build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Sponge Jars
path: |
Expand All @@ -58,17 +58,17 @@ jobs:
${{ github.workspace }}/vanilla/build/libs/*.jar
${{ github.workspace }}/forge/build/libs/*.jar
- name: SpongeVanilla Production Jar
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: SpongeVanilla Production Jar
path: "${{ github.workspace }}/vanilla/build/libs/*-universal.jar"
- name: SpongeForge Production Jar
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: SpongeForge Production Jar
path: "${{ github.workspace }}/forge/build/libs/*-universal.jar"
- name: SpongeVanilla libraries
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: SpongeVanilla installer libraries
path: "${{ github.workspace }}/vanilla/build/resources/installer/libraries.json"
Expand All @@ -80,29 +80,34 @@ jobs:
matrix:
os: [ubuntu-22.04, windows-latest, macos-latest]
java: [8, 11, 16]
exclude:
- os: macos-latest
java: 8
- os: macos-latest
java: 16
runs-on: "${{ matrix.os }}"
steps:
- name: Check out repository to use the build.gradle.kts as a hash file
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: code
- name: Download SpongeVanilla libraries as an additional hash file
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: SpongeVanilla installer libraries
path: "${{ github.workspace }}/code/libraries.json"
- name: "Setup JDK ${{ matrix.java }}"
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: "${{ matrix.java }}"
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: "${{ github.workspace}}/libraries"
key: "${{runner.os}}-${{matrix.java}}-it-libraries-${{ hashFiles('code/build.gradle.kts') }}-${{ github.workspace }}/code/libraries.json"
restore-keys: "${{runner.os}}-${{matrix.java}}-it-libraries-"
- name: Download SpongeVanilla server
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: SpongeVanilla Production Jar
- name: Run SpongeVanilla Test (windows)
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand All @@ -29,12 +29,12 @@ jobs:
restore-keys: |
${{ runner.os }}-minecraft-${{ env.CACHE_REV }}-
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1
uses: gradle/actions/wrapper-validation@v3
- name: Setup workspace
run: |
echo "GIT_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
Expand All @@ -45,7 +45,7 @@ jobs:
env:
CI_SYSTEM: Github Actions
- name: Archive artifacts for build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Sponge Jars
path: |
Expand All @@ -54,17 +54,17 @@ jobs:
${{ github.workspace }}/vanilla/build/libs/*.jar
${{ github.workspace }}/forge/build/libs/*.jar
- name: SpongeVanilla Production Jar
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: SpongeVanilla Production Jar
path: "${{ github.workspace }}/vanilla/build/libs/*-universal.jar"
- name: SpongeForge Production Jar
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: SpongeForge Production Jar
path: "${{ github.workspace }}/forge/build/libs/*-universal.jar"
- name: SpongeVanilla libraries
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: SpongeVanilla installer libraries
path: "${{ github.workspace }}/vanilla/build/resources/installer/libraries.json"
Expand All @@ -79,26 +79,26 @@ jobs:
runs-on: "${{ matrix.os }}"
steps:
- name: Check out repository to use the build.gradle.kts as a hash file
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: code
- name: Download SpongeVanilla libraries as an additional hash file
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: SpongeVanilla installer libraries
path: "${{ github.workspace }}/code/libraries.json"
- name: "Setup JDK ${{ matrix.java }}"
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: "${{ matrix.java }}"
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: "${{ github.workspace}}/libraries"
key: "${{runner.os}}-${{matrix.java}}-it-libraries-${{ hashFiles('code/build.gradle.kts') }}-${{ github.workspace }}/code/libraries.json"
restore-keys: "${{runner.os}}-${{matrix.java}}-it-libraries-"
- name: Download SpongeVanilla server
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: SpongeVanilla Production Jar
- name: Run SpongeVanilla Test (windows)
Expand All @@ -111,10 +111,10 @@ jobs:
needs: integrationTest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand All @@ -126,7 +126,7 @@ jobs:
restore-keys: |
${{ runner.os }}-minecraft-${{ env.CACHE_REV }}-
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
Expand Down

0 comments on commit 5192fb5

Please sign in to comment.