From 0b6ecbc771348cb63fd1bb02f7964c84c47e7ee2 Mon Sep 17 00:00:00 2001 From: 8Mi_Yile Date: Sat, 6 Jul 2024 18:56:20 +0800 Subject: [PATCH 1/5] Update common.yml --- .github/workflows/common.yml | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index d339188..d1bb56b 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -86,15 +86,29 @@ jobs: id: cslenv run: | output="$(ls build/libs | grep -v "sources")" - if [[ "${{ matrix.modtype }}" == "Forge"* ]]; then - modloader="Forge" - path=$(echo ${{ matrix.modtype }} | sed "s#-#/#") - else - modloader=${{ matrix.modtype }} - path=${{ matrix.modtype }} - fi + + case "${{ matrix.modtype }}" in + "ForgeV1") + modloader="Forge" + ;; + "ForgeV2" | "ForgeV3") + modloader=$(cat <> $GITHUB_OUTPUT - echo "modloader=$modloader" >> $GITHUB_OUTPUT + echo "modloader="$modloader"" >> $GITHUB_OUTPUT echo "filename=$(echo "$output"|grep $(echo ${{ matrix.modtype }}|sed "s#-##") )" >> $GITHUB_OUTPUT echo "version=$(grep "version=" build.properties | grep -v "#" | sed "s/version=//")" >> $GITHUB_OUTPUT echo "edition=$(echo ${{ matrix.modtype }} | sed "s/-//")" >> $GITHUB_OUTPUT From e1ad47f353585dca2649529946f4e147905ec08c Mon Sep 17 00:00:00 2001 From: 8Mi_Yile Date: Sat, 6 Jul 2024 18:59:27 +0800 Subject: [PATCH 2/5] Update common.yml --- .github/workflows/common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index d1bb56b..853829c 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -53,7 +53,7 @@ jobs: strategy: matrix: website: [CurseForge_Modrinth] - modtype: [Fabric,Forge-Active,Forge-Legacy] + modtype: [Fabric,ForgeV1,ForgeV2,ForgeV3] include: - website: ObjectStorage From 55e1f747ae3b1532d5456268f4fde547515edc12 Mon Sep 17 00:00:00 2001 From: 8Mi_Yile Date: Sat, 6 Jul 2024 19:08:15 +0800 Subject: [PATCH 3/5] Update common.yml --- .github/workflows/common.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index 853829c..db3c7df 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -90,6 +90,7 @@ jobs: case "${{ matrix.modtype }}" in "ForgeV1") modloader="Forge" + path=`echo "${{ matrix.modtype }}" | sed 's#V#/V#'` ;; "ForgeV2" | "ForgeV3") modloader=$(cat < Date: Sat, 6 Jul 2024 19:51:34 +0800 Subject: [PATCH 4/5] Update common.yml --- .github/workflows/common.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index db3c7df..daf4aa0 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -21,10 +21,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '8' @@ -39,7 +39,7 @@ jobs: export GIT_COMMIT_DESC=$(git log --format=%B -n 1 $GITHUB_SHA) ./gradlew clean build --stacktrace - - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 name: Publish to Github Artifact with: name: CustomSkinLoader-${{ inputs.type }}-${{ github.run_number }} @@ -69,9 +69,9 @@ jobs: steps: - name: Checkout Git Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 name: Download Artifact Zips with: path: build From 30e80ef61baea2a5742fc417ced209ebe67cfea6 Mon Sep 17 00:00:00 2001 From: 8Mi_Yile Date: Sat, 6 Jul 2024 19:59:38 +0800 Subject: [PATCH 5/5] Update common.yml --- .github/workflows/common.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index daf4aa0..5216cb6 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -151,7 +151,7 @@ jobs: - if: ${{ matrix.website == 'GitHub-PreRelease' && startsWith(github.ref, 'refs/heads') }} name: "[GitHub Pre-Release] Upload Tag" - uses: richardsimko/update-tag@v1.0.7 + uses: richardsimko/update-tag@v1 with: tag_name: CI-Build env: @@ -159,7 +159,7 @@ jobs: - if: ${{ matrix.website == 'GitHub-PreRelease' && startsWith(github.ref, 'refs/heads') }} name: "[GitHub Pre-Release] Publish" - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: token: ${{ secrets.GITHUB_TOKEN }} name: CustomSkinLoader CI-Build