diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index fcc69d9779..75d3490753 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -14,10 +14,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v5 with: + distribution: 'temurin' java-version: 17 - name: Set env run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV @@ -30,24 +31,6 @@ jobs: git tag ${RELEASE_VERSION} git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/Arc ${RELEASE_VERSION}; cd ../Mindustry - - name: Update JITpack repo - run: | - cd ../ - cp -r ./Mindustry ./MindustryJitpack - cd MindustryJitpack - git config --global user.name "Github Actions" - git config --global user.email "actions@github.com" - git clone --depth 1 https://github.com/Anuken/MindustryJitpack.git - rm -rf .git - cp -r ./MindustryJitpack/.git ./.git - rm -rf MindustryJitpack - rm -rf .github - rm README.md - git add . - git commit --allow-empty -m "Updating" - git tag ${RELEASE_VERSION} - git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack ${RELEASE_VERSION} - cd ../Mindustry - name: Create artifacts run: | ./gradlew desktop:dist server:dist core:depsJar core:assetsJar core:mergedJavadoc -Pbuildversion=${RELEASE_VERSION:1} diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 95cce8bab6..d8bd20638f 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -6,5 +6,5 @@ jobs: name: "Validation" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - uses: gradle/wrapper-validation-action@v2 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index ce978764c2..558a586be9 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,21 +10,23 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v5 with: + distribution: 'temurin' java-version: 17 - name: Fetch latest Arc run: git clone --depth=1 --branch=v9 https://github.com/Anuken/Arc ../Arc - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v6 - name: Run unit tests run: ./gradlew tests:test --stacktrace --rerun - name: Run unit tests and build JAR run: ./gradlew desktop:dist - name: Upload desktop JAR for testing - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: - name: Desktop JAR (zipped) + name: Desktop JAR + archive: false path: desktop/build/libs/Mindustry.jar diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index d3140f4a73..a2145fbe4c 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v7 - name: Trigger BE build if: ${{ github.repository == 'Anuken/Mindustry' }} run: | @@ -22,13 +22,14 @@ jobs: git config --global user.name "Github Actions" git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds ${BNUM} - name: Set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v5 with: + distribution: 'temurin' java-version: 17 - name: Fetch latest Arc run: git clone --depth=1 --branch=v9 https://github.com/Anuken/Arc ../Arc - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v6 - name: Update bundles if: ${{ github.repository == 'Anuken/Mindustry' }} run: | @@ -54,23 +55,5 @@ jobs: git commit -m "Automatic class mapping and map name update" git push fi - - name: Update JITpack repo - if: ${{ github.repository == 'Anuken/Mindustry' }} - run: | - git config --global user.name "Github Actions" - git config --global user.email "actions@github.com" - cd ../ - cp -r ./Mindustry ./MindustryJitpack - cd MindustryJitpack - git clone --depth 1 https://github.com/Anuken/MindustryJitpack.git - rm -rf .git - cp -r ./MindustryJitpack/.git ./.git - rm -rf MindustryJitpack - rm -rf .github - rm README.md - git add . - git commit --allow-empty -m "Updating" - git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack - cd ../Mindustry - name: Run unit tests run: ./gradlew tests:test --rerun --stacktrace