From d3bbc2a46b9e4c6d2559e3436aed689c7b8eac7f Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Tue, 8 Nov 2022 23:46:42 -0800 Subject: [PATCH 1/8] Update test-action.yml --- .github/workflows/test-action.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 9b9d9149f..f3f20abca 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -25,3 +25,9 @@ jobs: # Tool to use for archiving #type: # optional, default is zip + - name: upload zip + uses: actions/upload-artifact@v3 + with: + name: test-zip + path: test.zip + From 710383984e6d707c70e2eeb29e6aac2d7648453d Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Wed, 9 Nov 2022 00:12:11 -0800 Subject: [PATCH 2/8] Update manual-build.yml --- .github/workflows/manual-build.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 67edef0c3..7f704193e 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -100,11 +100,16 @@ jobs: - name: Rename JA2 UB output run: mv bin/VS2013/JA2_EN_Release_master_VS2019.exe ja2/ja2_ub_113_${{ env.SHA_SHORT }}.exe - - name: Upload executable + - name: Compress ja2 folder + uses: TheDoctor0/zip-release@0.6.2 + with: + filename: ja2-113.zip + path: ja2/ + exclusions: ja2/.git/ + + - name: Upload zip uses: actions/upload-artifact@v3 with: - name: ja2_113 - path: | - ja2/ - !ja2/.git/ + name: ja2-113.zip + path: ja2-113.zip From 5a5b016a7975eaffcf2d924202424bfd23625493 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Wed, 9 Nov 2022 01:09:29 -0800 Subject: [PATCH 3/8] Revert "Update manual-build.yml" This reverts commit 710383984e6d707c70e2eeb29e6aac2d7648453d. --- .github/workflows/manual-build.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 7f704193e..67edef0c3 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -100,16 +100,11 @@ jobs: - name: Rename JA2 UB output run: mv bin/VS2013/JA2_EN_Release_master_VS2019.exe ja2/ja2_ub_113_${{ env.SHA_SHORT }}.exe - - name: Compress ja2 folder - uses: TheDoctor0/zip-release@0.6.2 - with: - filename: ja2-113.zip - path: ja2/ - exclusions: ja2/.git/ - - - name: Upload zip + - name: Upload executable uses: actions/upload-artifact@v3 with: - name: ja2-113.zip - path: ja2-113.zip + name: ja2_113 + path: | + ja2/ + !ja2/.git/ From d5e2b384701856b79106a4c05434da33bd535d7a Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Wed, 9 Nov 2022 01:32:54 -0800 Subject: [PATCH 4/8] Update manual-build.yml --- .github/workflows/manual-build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 67edef0c3..1890753f8 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -1,21 +1,21 @@ -name: manual build +name: build -on: - workflow_dispatch: +on: [push, workflow_dispatch] jobs: build: + if: github.repository == '1dot13/source' runs-on: windows-latest steps: - uses: actions/checkout@v3 - uses: microsoft/setup-msbuild@v1.1 - - name: Shorten SHA + - name: Get short SHA run: echo "SHA_SHORT=$(git rev-parse --short ${{ github.sha }})" | Out-File -FilePath $env:GITHUB_ENV -Append - name: Get date - run: echo "DATE=$(Get-Date -Format yyyy.MM.dd)" | Out-File -FilePath $env:GITHUB_ENV -Append + run: echo "DATE=$(git log -1 --date=format:'%Y%b%d' --format=%cd)" | Out-File -FilePath $env:GITHUB_ENV -Append - name: Check vars run: | @@ -100,7 +100,7 @@ jobs: - name: Rename JA2 UB output run: mv bin/VS2013/JA2_EN_Release_master_VS2019.exe ja2/ja2_ub_113_${{ env.SHA_SHORT }}.exe - - name: Upload executable + - name: Upload output uses: actions/upload-artifact@v3 with: name: ja2_113 From d38494609047f2836c31745df2e1e7502e0725d4 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Wed, 9 Nov 2022 01:37:33 -0800 Subject: [PATCH 5/8] Update manual-build.yml --- .github/workflows/manual-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 1890753f8..2a0e1146b 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -4,7 +4,7 @@ on: [push, workflow_dispatch] jobs: build: - if: github.repository == '1dot13/source' + if: github.repository == 'rftrdev/1dot13-source' runs-on: windows-latest steps: From 7df289b732c9f73091c5ea4e956cb5c3c585077f Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Wed, 9 Nov 2022 01:38:09 -0800 Subject: [PATCH 6/8] Revert "Update manual-build.yml" This reverts commit d38494609047f2836c31745df2e1e7502e0725d4. --- .github/workflows/manual-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 2a0e1146b..1890753f8 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -4,7 +4,7 @@ on: [push, workflow_dispatch] jobs: build: - if: github.repository == 'rftrdev/1dot13-source' + if: github.repository == '1dot13/source' runs-on: windows-latest steps: From f3999ea3668e415349c91bce510d10ca0a248634 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Wed, 9 Nov 2022 01:42:25 -0800 Subject: [PATCH 7/8] Delete test-action.yml --- .github/workflows/test-action.yml | 33 ------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 .github/workflows/test-action.yml diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml deleted file mode 100644 index f3f20abca..000000000 --- a/.github/workflows/test-action.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: test-action - -on: - workflow_dispatch: - -jobs: - build: - runs-on: windows-latest - - steps: - - name: checkout - uses: actions/checkout@v3 - - - name: compress - uses: TheDoctor0/zip-release@0.6.2 - with: - filename: test.zip - #path: # optional, default is . - # Working directory before zipping - #directory: # optional, default is . - # List of excluded files / directories - #exclusions: # optional, default is - # List of excluded files / directories with recursive wildcards (only applies on Windows with `zip` type) - #recursive_exclusions: # optional, default is - # Tool to use for archiving - #type: # optional, default is zip - - - name: upload zip - uses: actions/upload-artifact@v3 - with: - name: test-zip - path: test.zip - From b7f687ff7e899bcae9854f6b3a20fe1fd9caa8fd Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Wed, 9 Nov 2022 01:43:54 -0800 Subject: [PATCH 8/8] Rename manual-build.yml to build.yml --- .github/workflows/{manual-build.yml => build.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{manual-build.yml => build.yml} (100%) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/build.yml similarity index 100% rename from .github/workflows/manual-build.yml rename to .github/workflows/build.yml