Skip to content

Commit

Permalink
Merge branch '1.19.2' into 1.19.3
Browse files Browse the repository at this point in the history
* 1.19.2:
  test
  again
  again
  again
  • Loading branch information
Faboslav committed Jan 15, 2024
2 parents f7f8f40 + 8fab29e commit e0b3f38
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 28 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:
java-version: 17
distribution: temurin

- name: "Setup Gradle"
uses: gradle/[email protected]
with:
cache-read-only: false
- name: "Setup Gradle"
uses: gradle/[email protected]
with:
cache-read-only: false

- name: "Run Gradle build"
run: ./gradlew build --no-daemon
- name: "Run Gradle build"
run: ./gradlew build --no-daemon

run-client:
needs: build
Expand Down
32 changes: 10 additions & 22 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ env:
friends-and-foes | depends | *
FORGE_DEPENDENCIES: |
friends-and-foes-forge | depends | *
RETRY_ATTEMPTS: 3
RELAY_DELAY: 10000
VERSION_RESOLVER: latest
jobs:
build:
Expand All @@ -38,13 +35,13 @@ jobs:
java-version: 17
distribution: temurin

- name: "Setup Gradle"
uses: gradle/[email protected]
with:
cache-read-only: false
- name: "Setup Gradle"
uses: gradle/[email protected]
with:
cache-read-only: false

- name: "Run Gradle build"
run: ./gradlew build --no-daemon
- name: "Run Gradle build"
run: ./gradlew build --no-daemon

- name: "Capture build artifacts"
uses: actions/[email protected]
Expand Down Expand Up @@ -86,7 +83,7 @@ jobs:
name: "friends-and-foes-flowery-mooblooms"

- name: "Publish Fabric to Github, CurseForge and Modrinth"
uses: Kir-Antipov/mc-publish@v3.2
uses: Kir-Antipov/mc-publish@v3.3.0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -95,20 +92,16 @@ jobs:

modrinth-id: ECOSu6pa
modrinth-featured: true
modrinth-unfeature-mode: version-intersection
modrinth-token: ${{ secrets.MODRINTH_RELEASE_TOKEN }}

files-primary: fabric/build/libs/friendsandfoes-flowerymooblooms-fabric-${{ github.ref_name }}.jar
files: fabric/build/libs/friendsandfoes-flowerymooblooms-fabric-${{ github.ref_name }}.jar
version-type: ${{ env.VERSION_TYPE }}
loaders: fabric
game-versions: ${{ env.GAME_VERSIONS }}
name: Friends&Foes - Flowery Mooblooms ${{ github.ref_name }} (Fabric/Quilt)
version: fabric-${{ github.ref_name }}
dependencies: ${{ env.FABRIC_DEPENDENCIES }}
java: ${{ env.JAVA_VERSIONS }}
retry-attempts: ${{ env.RETRY_ATTEMPTS }}
retry-delay: ${{ env.RETRY_DELAY }}
version-resolver: ${{ env.VERSION_RESOLVER }}

publish-forge:
needs: build
Expand All @@ -123,7 +116,7 @@ jobs:
name: "friends-and-foes-flowery-mooblooms"

- name: "Publish Forge to Github, CurseForge and Modrinth"
uses: Kir-Antipov/mc-publish@v3.2
uses: Kir-Antipov/mc-publish@v3.3.0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -132,17 +125,12 @@ jobs:

modrinth-id: wYtDgIUZ
modrinth-featured: true
modrinth-unfeature-mode: version-intersection
modrinth-token: ${{ secrets.MODRINTH_RELEASE_TOKEN }}

files-primary: forge/build/libs/friendsandfoes-flowerymooblooms-forge-${{ github.ref_name }}.jar
files: forge/build/libs/friendsandfoes-flowerymooblooms-forge-${{ github.ref_name }}.jar
version-type: ${{ env.VERSION_TYPE }}
loaders: forge
game-versions: ${{ env.GAME_VERSIONS }}
name: Friends&Foes - Flowery Mooblooms ${{ github.ref_name }} (Forge)
dependencies: ${{ env.FORGE_DEPENDENCIES }}
java: ${{ env.JAVA_VERSIONS }}

retry-attempts: ${{ env.RETRY_ATTEMPTS }}
retry-delay: ${{ env.RETRY_DELAY }}
version-resolver: ${{ env.VERSION_RESOLVER }}

0 comments on commit e0b3f38

Please sign in to comment.