From d34a28a50314ad2a02dc55e246d25edeb4b1a99c Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 15 Jun 2024 16:11:52 +0800 Subject: [PATCH 01/14] Add Set Hash --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e0b81da..e729251 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,6 +26,12 @@ jobs: with: fetch-depth: 0 + - name: Set Hash + shell: bash + run: | + Hash=`git rev-parse --short HEAD` + echo "Describe=$Describe" >> $GITHUB_ENV + - name: Set Describe shell: bash run: | From 0a2c01d773d20b7d50f78aed1c8a25895bf65789 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 15 Jun 2024 16:21:28 +0800 Subject: [PATCH 02/14] Add workflow_dispatch --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e729251..8a906a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,6 +9,7 @@ on: paths: - 'Plain Craft Launcher 2/**' - '.github/workflows/**' + workflow_dispatch jobs: From e70e90403380d3486fabf50281c17b840d813929 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 15 Jun 2024 16:24:21 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a906a1..bf9e754 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ on: paths: - 'Plain Craft Launcher 2/**' - '.github/workflows/**' - workflow_dispatch + workflow_dispatch: jobs: From 695fdc9068f32c6dd70d1569a7450f2ddec0d105 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 15 Jun 2024 16:32:15 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf9e754..ed04985 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,15 +27,11 @@ jobs: with: fetch-depth: 0 - - name: Set Hash - shell: bash - run: | - Hash=`git rev-parse --short HEAD` - echo "Describe=$Describe" >> $GITHUB_ENV - - name: Set Describe shell: bash run: | + Hash=`git rev-parse --short HEAD` + echo echo "Describe=$Hash" >> $GITHUB_ENV Describe=`git describe --tags` echo "Describe=$Describe" >> $GITHUB_ENV From a8ea33b3b215c01dd5899f3f795953284a89dd3f Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 15 Jun 2024 16:35:37 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed04985..c4d5958 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,6 +28,7 @@ jobs: fetch-depth: 0 - name: Set Describe + continue-on-error: true shell: bash run: | Hash=`git rev-parse --short HEAD` From 5994b38a4baa20a534491de62fa2352d7861f9ad Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 15 Jun 2024 16:43:27 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c4d5958..37a178d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,11 +31,16 @@ jobs: continue-on-error: true shell: bash run: | - Hash=`git rev-parse --short HEAD` - echo echo "Describe=$Hash" >> $GITHUB_ENV Describe=`git describe --tags` echo "Describe=$Describe" >> $GITHUB_ENV + - name: Set Hash when Describe is `` + if: ${{ env.Describe}}=`` + shell: bash + run: | + Hash=`git rev-parse --short HEAD` + echo "Describe=$Hash" >> $GITHUB_ENV + - name: Setup MSBuild.exe uses: microsoft/setup-msbuild@v2 with: From adbcb3399cdd26e714428a835e2bd464f5af6b4b Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 15 Jun 2024 16:45:04 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 37a178d..1719d6f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: Describe=`git describe --tags` echo "Describe=$Describe" >> $GITHUB_ENV - - name: Set Hash when Describe is `` + - name: Set Hash when Describe is Blank if: ${{ env.Describe}}=`` shell: bash run: | From 786f172425157cf614ba66a651df819e61acdfb5 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 15 Jun 2024 16:59:26 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1719d6f..8e07221 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,8 +34,8 @@ jobs: Describe=`git describe --tags` echo "Describe=$Describe" >> $GITHUB_ENV - - name: Set Hash when Describe is Blank - if: ${{ env.Describe}}=`` + - name: Set Hash as Describe when Describe is Blank + if: ${{ env.Describe }} shell: bash run: | Hash=`git rev-parse --short HEAD` From 7348a6be94e61466afa2ee5be29f8a715336b690 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 15 Jun 2024 17:08:04 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e07221..1e876ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: echo "Describe=$Describe" >> $GITHUB_ENV - name: Set Hash as Describe when Describe is Blank - if: ${{ env.Describe }} + if: ${{ ! env.Describe }} shell: bash run: | Hash=`git rev-parse --short HEAD` From 2c0ecc8100234e34ad1e651c58f4b98efaafd899 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 15 Jun 2024 18:06:52 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1e876ac..2d91edf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,6 +33,7 @@ jobs: run: | Describe=`git describe --tags` echo "Describe=$Describe" >> $GITHUB_ENV + exit 0 - name: Set Hash as Describe when Describe is Blank if: ${{ ! env.Describe }} From 1b186dc6ae27e41fe482b42ace9f456b19b449a5 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 15 Jun 2024 18:15:14 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2d91edf..a95c600 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,6 +32,9 @@ jobs: shell: bash run: | Describe=`git describe --tags` + if %errorlevel% neq 0 ( + exit /b 0 + ) echo "Describe=$Describe" >> $GITHUB_ENV exit 0 From f223ebfed92dd89cd6c414fddc76f628f3382982 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 15 Jun 2024 18:24:29 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a95c600..baba50a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,10 +31,7 @@ jobs: continue-on-error: true shell: bash run: | - Describe=`git describe --tags` - if %errorlevel% neq 0 ( - exit /b 0 - ) + Describe=`git describe --tags --always` echo "Describe=$Describe" >> $GITHUB_ENV exit 0 From b2e9a4486e60c9db99270ea684856c9b76561bd9 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 15 Jun 2024 18:26:47 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index baba50a..1a56a52 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,14 +33,6 @@ jobs: run: | Describe=`git describe --tags --always` echo "Describe=$Describe" >> $GITHUB_ENV - exit 0 - - - name: Set Hash as Describe when Describe is Blank - if: ${{ ! env.Describe }} - shell: bash - run: | - Hash=`git rev-parse --short HEAD` - echo "Describe=$Hash" >> $GITHUB_ENV - name: Setup MSBuild.exe uses: microsoft/setup-msbuild@v2 From fcc1afff3d5f7d4cc21abe8b04705130f20c75a5 Mon Sep 17 00:00:00 2001 From: allMagic <116283787+allMagicNB@users.noreply.github.com> Date: Sat, 15 Jun 2024 18:27:36 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a56a52..f2c4927 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,6 @@ jobs: fetch-depth: 0 - name: Set Describe - continue-on-error: true shell: bash run: | Describe=`git describe --tags --always`