From 235fd6e3183567f16d26dae6e1d143c7654082c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Fabi=C3=A1nek?= Date: Mon, 15 Jan 2024 18:21:22 +0100 Subject: [PATCH 1/4] again --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 12cb973..03ec3d2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -88,7 +88,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 }} @@ -125,7 +125,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 }} From 9d0f388477844ad1cb60d9f253a81fbd7738eb37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Fabi=C3=A1nek?= Date: Mon, 15 Jan 2024 18:30:24 +0100 Subject: [PATCH 2/4] again --- .github/workflows/build.yml | 12 ++++++------ .github/workflows/publish.yml | 22 ++++++++++------------ 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0b70720..8bc2caf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,13 +28,13 @@ jobs: java-version: 17 distribution: temurin - - name: "Setup Gradle" - uses: gradle/gradle-build-action@v2.11.1 - with: - cache-read-only: false + - name: "Setup Gradle" + uses: gradle/gradle-build-action@v2.11.1 + 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 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 03ec3d2..4fc55e7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -40,13 +40,13 @@ jobs: java-version: 17 distribution: temurin - - name: "Setup Gradle" - uses: gradle/gradle-build-action@v2.11.1 - with: - cache-read-only: false + - name: "Setup Gradle" + uses: gradle/gradle-build-action@v2.11.1 + 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/upload-artifact@v4.1.0 @@ -97,10 +97,9 @@ 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 }} @@ -110,7 +109,7 @@ jobs: java: ${{ env.JAVA_VERSIONS }} retry-attempts: ${{ env.RETRY_ATTEMPTS }} retry-delay: ${{ env.RETRY_DELAY }} - version-resolver: ${{ env.VERSION_RESOLVER }} + game-version-filter: ${{ env.VERSION_RESOLVER }} publish-forge: needs: build @@ -134,10 +133,9 @@ 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 }} @@ -147,4 +145,4 @@ jobs: retry-attempts: ${{ env.RETRY_ATTEMPTS }} retry-delay: ${{ env.RETRY_DELAY }} - version-resolver: ${{ env.VERSION_RESOLVER }} \ No newline at end of file + game-version-filter: ${{ env.VERSION_RESOLVER }} From fdc97107addb15a21bca46447210e47f050a4667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Fabi=C3=A1nek?= Date: Mon, 15 Jan 2024 18:38:21 +0100 Subject: [PATCH 3/4] again --- .github/workflows/publish.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4fc55e7..c0fd42e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,8 +18,6 @@ env: friends-and-foes | depends | * FORGE_DEPENDENCIES: | friends-and-foes-forge | depends | * - RETRY_ATTEMPTS: 3 - RELAY_DELAY: 10000 VERSION_RESOLVER: latest jobs: @@ -107,8 +105,6 @@ jobs: version: fabric-${{ github.ref_name }} dependencies: ${{ env.FABRIC_DEPENDENCIES }} java: ${{ env.JAVA_VERSIONS }} - retry-attempts: ${{ env.RETRY_ATTEMPTS }} - retry-delay: ${{ env.RETRY_DELAY }} game-version-filter: ${{ env.VERSION_RESOLVER }} publish-forge: @@ -142,7 +138,4 @@ jobs: 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 }} game-version-filter: ${{ env.VERSION_RESOLVER }} From 8fab29e0ddde8d8e695598e071b435036c44aadc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Fabi=C3=A1nek?= Date: Mon, 15 Jan 2024 18:42:45 +0100 Subject: [PATCH 4/4] test --- .github/workflows/publish.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c0fd42e..7c10783 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,7 +18,6 @@ env: friends-and-foes | depends | * FORGE_DEPENDENCIES: | friends-and-foes-forge | depends | * - VERSION_RESOLVER: latest jobs: build: @@ -105,7 +104,6 @@ jobs: version: fabric-${{ github.ref_name }} dependencies: ${{ env.FABRIC_DEPENDENCIES }} java: ${{ env.JAVA_VERSIONS }} - game-version-filter: ${{ env.VERSION_RESOLVER }} publish-forge: needs: build @@ -138,4 +136,3 @@ jobs: name: Friends&Foes - Flowery Mooblooms ${{ github.ref_name }} (Forge) dependencies: ${{ env.FORGE_DEPENDENCIES }} java: ${{ env.JAVA_VERSIONS }} - game-version-filter: ${{ env.VERSION_RESOLVER }}