From f2590b03cf792df42cb2986ba47ab4969ac46cee Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 15:13:32 +0000 Subject: [PATCH 01/61] adding windows build to test --- .github/workflows/build-windows.yml | 35 +++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/build-windows.yml diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml new file mode 100644 index 0000000..bdd04ea --- /dev/null +++ b/.github/workflows/build-windows.yml @@ -0,0 +1,35 @@ +name: 'build windows' + +on: + workflow_dispatch: + inputs: + reason: + description: 'The reason for running the workflow' + required: true + default: 'Manual Run' + +jobs: + build_windows: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + + - name: setup .Net 6 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 6.0.x + - name: Build Windows App + run: | + cd CutCode.CrossPlatform + dotnet publish -c Release -f net6.0 -r win7-x64 + - name: Archive Artifact + run: | + cd CutCode.CrossPlatform/bin/Release/net6.0/win7-x64 + powershell Compress-Archive -Path .\publish -DestinationPath WindowsZip.zip + - name: Upload Archive + id: upload-release-asset + uses: svenstaro/upload-release-action@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + file: ./CutCode.CrossPlatform/bin/Release/net6.0/win7-x64/WindowsZip.zip + asset_name: WindowsBuild.zip \ No newline at end of file From dbae5c93b3b4ab4f43320b1f117a784a44871efa Mon Sep 17 00:00:00 2001 From: sabuto Date: Mon, 14 Mar 2022 15:24:29 +0000 Subject: [PATCH 02/61] Update build-windows.yml --- .github/workflows/build-windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index bdd04ea..0fbcb70 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -31,5 +31,7 @@ jobs: uses: svenstaro/upload-release-action@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} file: ./CutCode.CrossPlatform/bin/Release/net6.0/win7-x64/WindowsZip.zip - asset_name: WindowsBuild.zip \ No newline at end of file + asset_name: WindowsBuild.zip From 26438cbc4a226adff50bcf9df01c17612b757530 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 15:37:05 +0000 Subject: [PATCH 03/61] add tag to release --- .github/workflows/build-windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 0fbcb70..b5c6ce8 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -35,3 +35,4 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ./CutCode.CrossPlatform/bin/Release/net6.0/win7-x64/WindowsZip.zip asset_name: WindowsBuild.zip + tag: '1.2.3' From 551627b9190ba57e3a94c231ae719c73595bb54e Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 15:58:01 +0000 Subject: [PATCH 04/61] rename and add linux --- ...windows.yml => build--release-windows.yml} | 21 +++++----- .github/workflows/build-release-linux.yml | 39 +++++++++++++++++++ 2 files changed, 50 insertions(+), 10 deletions(-) rename .github/workflows/{build-windows.yml => build--release-windows.yml} (78%) create mode 100644 .github/workflows/build-release-linux.yml diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build--release-windows.yml similarity index 78% rename from .github/workflows/build-windows.yml rename to .github/workflows/build--release-windows.yml index b5c6ce8..9c95cb8 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build--release-windows.yml @@ -1,19 +1,19 @@ name: 'build windows' on: - workflow_dispatch: - inputs: - reason: - description: 'The reason for running the workflow' + workflow_dispatch: + inputs: + version: + description: 'The version for the manual flow' required: true - default: 'Manual Run' - -jobs: + default: '1.2.3' + +jobs: build_windows: runs-on: windows-latest steps: - uses: actions/checkout@v2 - + - name: setup .Net 6 uses: actions/setup-dotnet@v1 with: @@ -27,12 +27,13 @@ jobs: cd CutCode.CrossPlatform/bin/Release/net6.0/win7-x64 powershell Compress-Archive -Path .\publish -DestinationPath WindowsZip.zip - name: Upload Archive + if: ${{ github.event_name == 'workflow_dispatch' }} id: upload-release-asset uses: svenstaro/upload-release-action@v2 - env: + env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ./CutCode.CrossPlatform/bin/Release/net6.0/win7-x64/WindowsZip.zip asset_name: WindowsBuild.zip - tag: '1.2.3' + tag: ${{ github.events.inputs.version }} diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml new file mode 100644 index 0000000..e75bdc8 --- /dev/null +++ b/.github/workflows/build-release-linux.yml @@ -0,0 +1,39 @@ +name: 'build windows' + +on: + workflow_dispatch: + inputs: + version: + description: 'The version for the manual flow' + required: true + default: '1.2.3' + +jobs: + build_windows: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: setup .Net 6 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 6.0.x + - name: Build Linux App + run: | + cd CutCode.CrossPlatform + dotnet publish -c Release -f net6.0 -r linux-x64 + - name: Archive Artifact + run: | + cd CutCode.CrossPlatform/bin/Release/net6.0/linux-x64 + tar -czvf -Path Linux.tar.gz release + - name: Upload Archive + if: ${{ github.event_name == 'workflow_dispatch' }} + id: upload-release-asset + uses: svenstaro/upload-release-action@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ./CutCode.CrossPlatform/bin/Release/net6.0/linux-x64/Linux.tar.gz + asset_name: LinuxBuild.tar.gz + tag: ${{ github.events.inputs.version }} From 137891a5ee4f438a64b84b41ec82dda681fc23e2 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 16:10:55 +0000 Subject: [PATCH 05/61] update things --- .github/workflows/build--release-windows.yml | 6 ++++++ .github/workflows/build-release-all.yml | 19 +++++++++++++++++++ .github/workflows/build-release-linux.yml | 19 ++++++++++++++++++- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/build-release-all.yml diff --git a/.github/workflows/build--release-windows.yml b/.github/workflows/build--release-windows.yml index 9c95cb8..0b5a4f2 100644 --- a/.github/workflows/build--release-windows.yml +++ b/.github/workflows/build--release-windows.yml @@ -7,6 +7,12 @@ on: description: 'The version for the manual flow' required: true default: '1.2.3' + workflow_call: + inputs: + version: + description: 'The version for the manual flow' + required: true + type: string jobs: build_windows: diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml new file mode 100644 index 0000000..18d9100 --- /dev/null +++ b/.github/workflows/build-release-all.yml @@ -0,0 +1,19 @@ +name: 'build All' + +on: + workflow_dispatch: + inputs: + version: + description: 'The version for the manual flow' + required: true + default: '1.2.3' + +jobs: + build-windows: + uses: ./.github/workflows/build-release-windows.yml + with: + version: ${{ inputs.version }} + build-linux: + uses: ./.github/workflows/build-release-linux.yml + with: + version: ${{ inputs.version }} \ No newline at end of file diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index e75bdc8..2538431 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -1,4 +1,4 @@ -name: 'build windows' +name: 'build Linux' on: workflow_dispatch: @@ -7,6 +7,12 @@ on: description: 'The version for the manual flow' required: true default: '1.2.3' + workflow_call: + inputs: + version: + description: 'The version for the manual flow' + required: true + type: string jobs: build_windows: @@ -37,3 +43,14 @@ jobs: file: ./CutCode.CrossPlatform/bin/Release/net6.0/linux-x64/Linux.tar.gz asset_name: LinuxBuild.tar.gz tag: ${{ github.events.inputs.version }} + - name: Upload Archive + if: ${{ github.event_name == 'workflow_call' }} + id: upload-release-asset + uses: svenstaro/upload-release-action@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ./CutCode.CrossPlatform/bin/Release/net6.0/linux-x64/Linux.tar.gz + asset_name: LinuxBuild.tar.gz + tag: ${{ inputs.version }} \ No newline at end of file From 1116cd867ee24cb2f819005086b9a3142800d3cb Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 16:11:14 +0000 Subject: [PATCH 06/61] update again --- .../{build--release-windows.yml => build-release-windows.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{build--release-windows.yml => build-release-windows.yml} (100%) diff --git a/.github/workflows/build--release-windows.yml b/.github/workflows/build-release-windows.yml similarity index 100% rename from .github/workflows/build--release-windows.yml rename to .github/workflows/build-release-windows.yml From b366efd2154a7c58ce6998733607a443a5828805 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 16:13:21 +0000 Subject: [PATCH 07/61] try again --- .github/workflows/build-release-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index 2538431..d598921 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -15,7 +15,7 @@ on: type: string jobs: - build_windows: + build_linux: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From 6b9c8b09fb2c7498fd5d3fd8dc57613232ed654e Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 16:15:15 +0000 Subject: [PATCH 08/61] s --- .github/workflows/build-release-linux.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index d598921..b4d15f7 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -7,12 +7,12 @@ on: description: 'The version for the manual flow' required: true default: '1.2.3' - workflow_call: - inputs: - version: - description: 'The version for the manual flow' - required: true - type: string + workflow_call: + inputs: + version: + description: 'The version for the manual flow' + required: true + type: string jobs: build_linux: From 22bce5407307095bddc035e461becc1252a92aca Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 16:30:26 +0000 Subject: [PATCH 09/61] rename build --- .github/workflows/build-release-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index b4d15f7..cc8a201 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -15,7 +15,7 @@ on: type: string jobs: - build_linux: + build_test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From 468a4c23ecd07b8a89c1ea99ec8e098edf9f7de3 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 16:32:14 +0000 Subject: [PATCH 10/61] test --- .github/workflows/build-release-linux.yml | 41 +++++++++-------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index cc8a201..0b5a4f2 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -1,4 +1,4 @@ -name: 'build Linux' +name: 'build windows' on: workflow_dispatch: @@ -7,16 +7,16 @@ on: description: 'The version for the manual flow' required: true default: '1.2.3' - workflow_call: - inputs: - version: - description: 'The version for the manual flow' - required: true - type: string + workflow_call: + inputs: + version: + description: 'The version for the manual flow' + required: true + type: string jobs: - build_test: - runs-on: ubuntu-latest + build_windows: + runs-on: windows-latest steps: - uses: actions/checkout@v2 @@ -24,14 +24,14 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: 6.0.x - - name: Build Linux App + - name: Build Windows App run: | cd CutCode.CrossPlatform - dotnet publish -c Release -f net6.0 -r linux-x64 + dotnet publish -c Release -f net6.0 -r win7-x64 - name: Archive Artifact run: | - cd CutCode.CrossPlatform/bin/Release/net6.0/linux-x64 - tar -czvf -Path Linux.tar.gz release + cd CutCode.CrossPlatform/bin/Release/net6.0/win7-x64 + powershell Compress-Archive -Path .\publish -DestinationPath WindowsZip.zip - name: Upload Archive if: ${{ github.event_name == 'workflow_dispatch' }} id: upload-release-asset @@ -40,17 +40,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./CutCode.CrossPlatform/bin/Release/net6.0/linux-x64/Linux.tar.gz - asset_name: LinuxBuild.tar.gz + file: ./CutCode.CrossPlatform/bin/Release/net6.0/win7-x64/WindowsZip.zip + asset_name: WindowsBuild.zip tag: ${{ github.events.inputs.version }} - - name: Upload Archive - if: ${{ github.event_name == 'workflow_call' }} - id: upload-release-asset - uses: svenstaro/upload-release-action@v2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./CutCode.CrossPlatform/bin/Release/net6.0/linux-x64/Linux.tar.gz - asset_name: LinuxBuild.tar.gz - tag: ${{ inputs.version }} \ No newline at end of file From e85a49fffcc137257174257068fd6524f2f8db9f Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 16:33:24 +0000 Subject: [PATCH 11/61] updated events --- .github/workflows/build-release-all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 18d9100..15e0722 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -12,8 +12,8 @@ jobs: build-windows: uses: ./.github/workflows/build-release-windows.yml with: - version: ${{ inputs.version }} + version: ${{ github.events.inputs.version }} build-linux: uses: ./.github/workflows/build-release-linux.yml with: - version: ${{ inputs.version }} \ No newline at end of file + version: ${{ github.events.inputs.version }} \ No newline at end of file From 54e48ad40539364f40e2ebaf36ac58b215a4aa30 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 16:38:35 +0000 Subject: [PATCH 12/61] update both workflows --- .github/workflows/build-release-linux.yml | 18 +++++++++--------- .github/workflows/build-release-windows.yml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index 0b5a4f2..d3a57a4 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -15,8 +15,8 @@ on: type: string jobs: - build_windows: - runs-on: windows-latest + build_linux: + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -24,22 +24,22 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: 6.0.x - - name: Build Windows App + - name: Build Linux App run: | cd CutCode.CrossPlatform - dotnet publish -c Release -f net6.0 -r win7-x64 + dotnet publish -c Release -f net6.0 -r linux-x64 - name: Archive Artifact run: | - cd CutCode.CrossPlatform/bin/Release/net6.0/win7-x64 - powershell Compress-Archive -Path .\publish -DestinationPath WindowsZip.zip + cd CutCode.CrossPlatform/bin/Release/net6.0/linux-x64 + tar -czvf CutCodeLinux.tar.gz publish - name: Upload Archive - if: ${{ github.event_name == 'workflow_dispatch' }} + if: ${{ github.event_name == 'workflow_call' }} id: upload-release-asset uses: svenstaro/upload-release-action@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./CutCode.CrossPlatform/bin/Release/net6.0/win7-x64/WindowsZip.zip - asset_name: WindowsBuild.zip + file: ./CutCode.CrossPlatform/bin/Release/net6.0/linux-x64/CutCodeLinux.tar.gz + asset_name: LinuxBuild.zip tag: ${{ github.events.inputs.version }} diff --git a/.github/workflows/build-release-windows.yml b/.github/workflows/build-release-windows.yml index 0b5a4f2..7bac015 100644 --- a/.github/workflows/build-release-windows.yml +++ b/.github/workflows/build-release-windows.yml @@ -33,7 +33,7 @@ jobs: cd CutCode.CrossPlatform/bin/Release/net6.0/win7-x64 powershell Compress-Archive -Path .\publish -DestinationPath WindowsZip.zip - name: Upload Archive - if: ${{ github.event_name == 'workflow_dispatch' }} + if: ${{ github.event_name == 'workflow_call' }} id: upload-release-asset uses: svenstaro/upload-release-action@v2 env: From bb877596a0e0032d9f155ae2d7d072dc27573889 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 16:49:10 +0000 Subject: [PATCH 13/61] remove if statement --- .github/workflows/build-release-linux.yml | 1 - .github/workflows/build-release-windows.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index d3a57a4..7cb962c 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -33,7 +33,6 @@ jobs: cd CutCode.CrossPlatform/bin/Release/net6.0/linux-x64 tar -czvf CutCodeLinux.tar.gz publish - name: Upload Archive - if: ${{ github.event_name == 'workflow_call' }} id: upload-release-asset uses: svenstaro/upload-release-action@v2 env: diff --git a/.github/workflows/build-release-windows.yml b/.github/workflows/build-release-windows.yml index 7bac015..328733b 100644 --- a/.github/workflows/build-release-windows.yml +++ b/.github/workflows/build-release-windows.yml @@ -33,7 +33,6 @@ jobs: cd CutCode.CrossPlatform/bin/Release/net6.0/win7-x64 powershell Compress-Archive -Path .\publish -DestinationPath WindowsZip.zip - name: Upload Archive - if: ${{ github.event_name == 'workflow_call' }} id: upload-release-asset uses: svenstaro/upload-release-action@v2 env: From b8bbfdd3bcd184c05c8af870e0fed8566a2b441a Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 17:41:11 +0000 Subject: [PATCH 14/61] testing --- .github/workflows/build-release-linux.yml | 2 +- .github/workflows/build-release-windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index 7cb962c..07d664b 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -41,4 +41,4 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ./CutCode.CrossPlatform/bin/Release/net6.0/linux-x64/CutCodeLinux.tar.gz asset_name: LinuxBuild.zip - tag: ${{ github.events.inputs.version }} + tag: ${{ inputs.version }} diff --git a/.github/workflows/build-release-windows.yml b/.github/workflows/build-release-windows.yml index 328733b..06b525d 100644 --- a/.github/workflows/build-release-windows.yml +++ b/.github/workflows/build-release-windows.yml @@ -41,4 +41,4 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ./CutCode.CrossPlatform/bin/Release/net6.0/win7-x64/WindowsZip.zip asset_name: WindowsBuild.zip - tag: ${{ github.events.inputs.version }} + tag: ${{ inputs.version }} From 86e258351f43383008f6d58e72c347501606a03c Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 17:41:49 +0000 Subject: [PATCH 15/61] revert --- .github/workflows/build-release-linux.yml | 2 +- .github/workflows/build-release-windows.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index 07d664b..7cb962c 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -41,4 +41,4 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ./CutCode.CrossPlatform/bin/Release/net6.0/linux-x64/CutCodeLinux.tar.gz asset_name: LinuxBuild.zip - tag: ${{ inputs.version }} + tag: ${{ github.events.inputs.version }} diff --git a/.github/workflows/build-release-windows.yml b/.github/workflows/build-release-windows.yml index 06b525d..328733b 100644 --- a/.github/workflows/build-release-windows.yml +++ b/.github/workflows/build-release-windows.yml @@ -41,4 +41,4 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ./CutCode.CrossPlatform/bin/Release/net6.0/win7-x64/WindowsZip.zip asset_name: WindowsBuild.zip - tag: ${{ inputs.version }} + tag: ${{ github.events.inputs.version }} From 4855671bc3e8d846223cda0557bf85866bd0063f Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 17:43:38 +0000 Subject: [PATCH 16/61] uppdate required --- .github/workflows/build-release-linux.yml | 6 +++--- .github/workflows/build-release-windows.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index 7cb962c..7eba8e9 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -5,13 +5,13 @@ on: inputs: version: description: 'The version for the manual flow' - required: true + required: false default: '1.2.3' workflow_call: inputs: version: description: 'The version for the manual flow' - required: true + required: false type: string jobs: @@ -41,4 +41,4 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ./CutCode.CrossPlatform/bin/Release/net6.0/linux-x64/CutCodeLinux.tar.gz asset_name: LinuxBuild.zip - tag: ${{ github.events.inputs.version }} + tag: ${{ inputs.version }} diff --git a/.github/workflows/build-release-windows.yml b/.github/workflows/build-release-windows.yml index 328733b..8ef5b99 100644 --- a/.github/workflows/build-release-windows.yml +++ b/.github/workflows/build-release-windows.yml @@ -5,13 +5,13 @@ on: inputs: version: description: 'The version for the manual flow' - required: true + required: false default: '1.2.3' workflow_call: inputs: version: description: 'The version for the manual flow' - required: true + required: false type: string jobs: @@ -41,4 +41,4 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ./CutCode.CrossPlatform/bin/Release/net6.0/win7-x64/WindowsZip.zip asset_name: WindowsBuild.zip - tag: ${{ github.events.inputs.version }} + tag: ${{ inputs.version }} From c6a1b54a3d3c8884ff5f6c2758892b4f805af6ac Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 17:46:06 +0000 Subject: [PATCH 17/61] update things --- .github/workflows/build-release-all.yml | 4 ++++ .github/workflows/build-release-linux.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 15e0722..35a8c9c 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -9,6 +9,10 @@ on: default: '1.2.3' jobs: + echo-input: + runs-on: ubuntu-latest + steps: + - run: echo ${{ github.events.inputs.version }} build-windows: uses: ./.github/workflows/build-release-windows.yml with: diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index 7eba8e9..972511e 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -18,6 +18,7 @@ jobs: build_linux: runs-on: ubuntu-latest steps: + - run: echo ${{ inputs.version }} - uses: actions/checkout@v2 - name: setup .Net 6 From 29f0e27a528ccd3cad23f1fd0e59c81dd7f2c22c Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 20:32:41 +0000 Subject: [PATCH 18/61] update for tags --- .github/workflows/build-release-all.yml | 13 +++++-------- .github/workflows/build-release-linux.yml | 8 +------- .github/workflows/build-release-windows.yml | 6 ------ 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 35a8c9c..24290be 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -1,18 +1,15 @@ name: 'build All' on: - workflow_dispatch: - inputs: - version: - description: 'The version for the manual flow' - required: true - default: '1.2.3' + push: + tags: + - 'v*' jobs: echo-input: runs-on: ubuntu-latest steps: - - run: echo ${{ github.events.inputs.version }} + - run: echo ${{ github.ref }} build-windows: uses: ./.github/workflows/build-release-windows.yml with: @@ -20,4 +17,4 @@ jobs: build-linux: uses: ./.github/workflows/build-release-linux.yml with: - version: ${{ github.events.inputs.version }} \ No newline at end of file + version: ${{ github.ref }} \ No newline at end of file diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index 972511e..c527a0a 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -1,17 +1,11 @@ name: 'build windows' on: - workflow_dispatch: - inputs: - version: - description: 'The version for the manual flow' - required: false - default: '1.2.3' workflow_call: inputs: version: description: 'The version for the manual flow' - required: false + required: true type: string jobs: diff --git a/.github/workflows/build-release-windows.yml b/.github/workflows/build-release-windows.yml index 8ef5b99..62b5441 100644 --- a/.github/workflows/build-release-windows.yml +++ b/.github/workflows/build-release-windows.yml @@ -1,12 +1,6 @@ name: 'build windows' on: - workflow_dispatch: - inputs: - version: - description: 'The version for the manual flow' - required: false - default: '1.2.3' workflow_call: inputs: version: From 8e891d85ea4a5071aa2ed0a724a7650407004812 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 20:41:47 +0000 Subject: [PATCH 19/61] remove unnessasery job and update for windows build --- .github/workflows/build-release-all.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 24290be..bc4ff95 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -5,15 +5,11 @@ on: tags: - 'v*' -jobs: - echo-input: - runs-on: ubuntu-latest - steps: - - run: echo ${{ github.ref }} +jobs: build-windows: uses: ./.github/workflows/build-release-windows.yml with: - version: ${{ github.events.inputs.version }} + version: ${{ github.ref }} build-linux: uses: ./.github/workflows/build-release-linux.yml with: From c8fbc4b89b12b0669e98c959e818af63f1abd925 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 21:02:29 +0000 Subject: [PATCH 20/61] add base installer with replaceable strings and update build release --- .github/workflows/build-release-all.yml | 27 ++++++++++++++- CutCode_linux_x64_installer.sh | 46 +++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 CutCode_linux_x64_installer.sh diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index bc4ff95..7154453 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -7,10 +7,35 @@ on: jobs: build-windows: + name: Build and release Windows Version uses: ./.github/workflows/build-release-windows.yml with: version: ${{ github.ref }} build-linux: + name: Build and release Linux Version uses: ./.github/workflows/build-release-linux.yml with: - version: ${{ github.ref }} \ No newline at end of file + version: ${{ github.ref }} + update-linux-installer: + name: Update linux installer file + needs: + - build-windows + - build-linux + runs-on: ubuntu-latest + steps: + - name: Get Version + id: get_version + uses: battila7/get-version-action@v2.2.1 + - run: sed -i "s/__VERSION__/${{ steps.get_version.outputs.version}}/g" CutCode_linux_x64_installer.sh + - name: Upload linux installer file + id: upload-release-asset + uses: svenstaro/upload-release-action@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ./CutCode_linux_x64_installer.sh + asset_name: CutCode_linux_x64_installer.sh + tag: ${{ github.ref }} + + \ No newline at end of file diff --git a/CutCode_linux_x64_installer.sh b/CutCode_linux_x64_installer.sh new file mode 100644 index 0000000..ade8adf --- /dev/null +++ b/CutCode_linux_x64_installer.sh @@ -0,0 +1,46 @@ +BASE_URL="https://github.com/Abdesol/CutCode/releases/download/" +VERSION="__VERSION__" +FILE="CutCode.__VERSION__.linux.x64.zip" +FOLDER="CutCode __VERSION__ linux x64" + + +if [ "$EUID" -ne 0 ] + then echo "Please run as root" + exit +fi + +#Make cutcode tmp file +rm -rf cutcode-tmp +mkdir cutcode-tmp +cd cutcode-tmp +dialog --infobox "installing CutCode..." 20 60 +#Get built files and unzip them +curl -LO $BASE_URL/$VERSION/$FILE +unzip $FILE + +#make directory to put built files into and put the files +rm -rf /opt/CutCode/ +mkdir /opt/CutCode/ +cp -r "$FOLDER"/* /opt/CutCode + +#make needed file executables +chmod +x /opt/CutCode/CutCode +#add file to /usr/bin/ and make it executable +echo "/opt/CutCode/CutCode" > /usr/bin/CutCode +chmod +x /usr/bin/CutCode +#add .desktop file +cp "$FOLDER"/CutCode.desktop /usr/share/applications/ + +# Delete the temp file +cd .. +rm -rf cutcode-tmp + +whiptail --msgbox "CutCode has been installed successfully" + + + +if whiptail --yesno "Do you want to open CutCode?" 20 60 ;then + CutCode +else + whiptail --msgbox "Thanks for installing CutCode, you can either launch it by running CutCode or search for CutCode in your app drawer" 20 60 +fi From daf8fc3e2fb4d36971e141dc4224a37754832711 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Mon, 14 Mar 2022 22:15:13 +0000 Subject: [PATCH 21/61] update path --- .github/workflows/build-release-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 7154453..f322837 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -26,7 +26,7 @@ jobs: - name: Get Version id: get_version uses: battila7/get-version-action@v2.2.1 - - run: sed -i "s/__VERSION__/${{ steps.get_version.outputs.version}}/g" CutCode_linux_x64_installer.sh + - run: sed -i "s/__VERSION__/${{ steps.get_version.outputs.version}}/g" ./CutCode_linux_x64_installer.sh - name: Upload linux installer file id: upload-release-asset uses: svenstaro/upload-release-action@v2 From 713da8dbde75be9a26f6788a9c8b81385d578a5e Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 11:20:32 +0000 Subject: [PATCH 22/61] update for testing --- .github/workflows/build-release-all.yml | 29 ++++++++++++++----------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index f322837..715706b 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -4,28 +4,31 @@ on: push: tags: - 'v*' + workflow_dispatch: + jobs: - build-windows: - name: Build and release Windows Version - uses: ./.github/workflows/build-release-windows.yml - with: - version: ${{ github.ref }} - build-linux: - name: Build and release Linux Version - uses: ./.github/workflows/build-release-linux.yml - with: - version: ${{ github.ref }} +# build-windows: +# name: Build and release Windows Version +# uses: ./.github/workflows/build-release-windows.yml +# with: +# version: ${{ github.ref }} +# build-linux: +# name: Build and release Linux Version +# uses: ./.github/workflows/build-release-linux.yml +# with: +# version: ${{ github.ref }} update-linux-installer: name: Update linux installer file - needs: - - build-windows - - build-linux +# needs: +# - build-windows +# - build-linux runs-on: ubuntu-latest steps: - name: Get Version id: get_version uses: battila7/get-version-action@v2.2.1 + - run: ls - run: sed -i "s/__VERSION__/${{ steps.get_version.outputs.version}}/g" ./CutCode_linux_x64_installer.sh - name: Upload linux installer file id: upload-release-asset From 0cc72c44fa4a7f38e6ad8be1d161cb775d28c39d Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 11:22:18 +0000 Subject: [PATCH 23/61] t --- .github/workflows/build-release-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 715706b..a2b1451 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -28,7 +28,7 @@ jobs: - name: Get Version id: get_version uses: battila7/get-version-action@v2.2.1 - - run: ls + - run: pwd - run: sed -i "s/__VERSION__/${{ steps.get_version.outputs.version}}/g" ./CutCode_linux_x64_installer.sh - name: Upload linux installer file id: upload-release-asset From ac83ac48a2e92d1e83d8e08d2b857e00d8328026 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 11:23:18 +0000 Subject: [PATCH 24/61] t --- .github/workflows/build-release-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index a2b1451..9752ff2 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -25,10 +25,10 @@ jobs: # - build-linux runs-on: ubuntu-latest steps: + - run: pwd && ls -la - name: Get Version id: get_version uses: battila7/get-version-action@v2.2.1 - - run: pwd - run: sed -i "s/__VERSION__/${{ steps.get_version.outputs.version}}/g" ./CutCode_linux_x64_installer.sh - name: Upload linux installer file id: upload-release-asset From cebed720722c5549995fd28ae683b0aea0885ca3 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 11:26:06 +0000 Subject: [PATCH 25/61] t --- .github/workflows/build-release-all.yml | 1 + .github/workflows/build-release-linux.yml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 9752ff2..0380de3 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -25,6 +25,7 @@ jobs: # - build-linux runs-on: ubuntu-latest steps: + - uses: actions/checkout@v2 - run: pwd && ls -la - name: Get Version id: get_version diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index c527a0a..07df9a7 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -12,7 +12,6 @@ jobs: build_linux: runs-on: ubuntu-latest steps: - - run: echo ${{ inputs.version }} - uses: actions/checkout@v2 - name: setup .Net 6 From bd4e859e8b41ad457dddae8890060b0d5ed33212 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 14:05:37 +0000 Subject: [PATCH 26/61] final build before pr --- .github/workflows/build-release-all.yml | 29 ++++++++++++------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 0380de3..541a78b 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -3,26 +3,25 @@ on: push: tags: - - 'v*' - workflow_dispatch: + - 'v*' jobs: -# build-windows: -# name: Build and release Windows Version -# uses: ./.github/workflows/build-release-windows.yml -# with: -# version: ${{ github.ref }} -# build-linux: -# name: Build and release Linux Version -# uses: ./.github/workflows/build-release-linux.yml -# with: -# version: ${{ github.ref }} + build-windows: + name: Build and release Windows Version + uses: ./.github/workflows/build-release-windows.yml + with: + version: ${{ github.ref }} + build-linux: + name: Build and release Linux Version + uses: ./.github/workflows/build-release-linux.yml + with: + version: ${{ github.ref }} update-linux-installer: name: Update linux installer file -# needs: -# - build-windows -# - build-linux + needs: + - build-windows + - build-linux runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From 09d31d89b268dc7e918928292002c941d532d7a3 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 15:19:33 +0000 Subject: [PATCH 27/61] add mac build and add .app properties to csproj --- .github/workflows/build-release-mac.yml | 45 +++++++++++++++++++ .../CutCode.CrossPlatform.csproj | 14 ++++++ 2 files changed, 59 insertions(+) create mode 100644 .github/workflows/build-release-mac.yml diff --git a/.github/workflows/build-release-mac.yml b/.github/workflows/build-release-mac.yml new file mode 100644 index 0000000..8be4b2e --- /dev/null +++ b/.github/workflows/build-release-mac.yml @@ -0,0 +1,45 @@ +name: 'build windows' + +on: + workflow_call: + inputs: + version: + description: 'The version for the manual flow' + required: true + type: string + +jobs: + build_linux: + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + + - name: setup .Net 6 + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 6.0.x + - name: Build Linux App + run: | + cd CutCode.CrossPlatform + dotnet restore -r osx-x64 + dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-x64 -property:Configuration=Release + mkdir Assets/logo.iconset + cp Assets/Images/logo.png Assets/logo.iconset/icon_512x512.png + iconutil -c icns Assets/logo.iconset + cp Assets/logo.icns bin/Release/net6/osx-x64/publish/CutCode.app/Contents/Resources/logo.icns + rm Assets/logo.icns + rm -rf Assets/logo.iconset + - name: Archive Artifact + run: | + cd CutCode.CrossPlatform/bin/Release/net6.0/osx-x64/publish + zip -r CutCodeMac.zip CutCode.app + - name: Upload Archive + id: upload-release-asset + uses: svenstaro/upload-release-action@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ./CutCode.CrossPlatform/bin/Release/net6.0/osx-x64/publish/CutCodeMac.zip + asset_name: LinuxBuild.zip + tag: ${{ inputs.version }} \ No newline at end of file diff --git a/CutCode.CrossPlatform/CutCode.CrossPlatform.csproj b/CutCode.CrossPlatform/CutCode.CrossPlatform.csproj index d81fb5e..02cbabd 100644 --- a/CutCode.CrossPlatform/CutCode.CrossPlatform.csproj +++ b/CutCode.CrossPlatform/CutCode.CrossPlatform.csproj @@ -14,6 +14,19 @@ CutCode.CrossPlatform.Program Assets\Images\logo.ico + + CutCode + CutCode + com.cutcode + 3.0.0 + 3.0.0 + APPL + ???? + CutCode + /Assets/logo.icns + NSApplication + true + @@ -32,6 +45,7 @@ + From 15d39e676aca3c1de063d4fa8dd7148860cb8ec4 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 15:26:25 +0000 Subject: [PATCH 28/61] add mac to overall build --- .github/workflows/build-release-all.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 541a78b..f6a7049 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -17,11 +17,17 @@ jobs: uses: ./.github/workflows/build-release-linux.yml with: version: ${{ github.ref }} + build-mac: + name: Build and release Linux Version + uses: ./.github/workflows/build-release-mac.yml + with: + version: ${{ github.ref }} update-linux-installer: name: Update linux installer file needs: - build-windows - build-linux + - build_mac runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From c434243df93f7287cea936d6fbe6480026557ec6 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 16:42:46 +0000 Subject: [PATCH 29/61] trying mac build --- .github/workflows/build-release-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index f6a7049..b9411df 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -27,7 +27,7 @@ jobs: needs: - build-windows - build-linux - - build_mac + - build-mac runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From cdbbd873801558ad64843f56f45213235171ce66 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 16:45:28 +0000 Subject: [PATCH 30/61] update some things --- .github/workflows/build-release-linux.yml | 5 +++-- .github/workflows/build-release-mac.yml | 9 +++++---- .github/workflows/build-release-windows.yml | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index 07df9a7..90d4fe2 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -1,4 +1,4 @@ -name: 'build windows' +name: 'build linux' on: workflow_call: @@ -10,6 +10,7 @@ on: jobs: build_linux: + name: Build Linux App runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -34,5 +35,5 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ./CutCode.CrossPlatform/bin/Release/net6.0/linux-x64/CutCodeLinux.tar.gz - asset_name: LinuxBuild.zip + asset_name: LinuxBuild.tar.gz tag: ${{ inputs.version }} diff --git a/.github/workflows/build-release-mac.yml b/.github/workflows/build-release-mac.yml index 8be4b2e..08a8ff1 100644 --- a/.github/workflows/build-release-mac.yml +++ b/.github/workflows/build-release-mac.yml @@ -1,4 +1,4 @@ -name: 'build windows' +name: 'build mac' on: workflow_call: @@ -9,7 +9,8 @@ on: type: string jobs: - build_linux: + build_mac: + name: Build Mac App runs-on: macos-latest steps: - uses: actions/checkout@v2 @@ -18,7 +19,7 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: 6.0.x - - name: Build Linux App + - name: Build Mac App run: | cd CutCode.CrossPlatform dotnet restore -r osx-x64 @@ -41,5 +42,5 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ./CutCode.CrossPlatform/bin/Release/net6.0/osx-x64/publish/CutCodeMac.zip - asset_name: LinuxBuild.zip + asset_name: MacBuild.zip tag: ${{ inputs.version }} \ No newline at end of file diff --git a/.github/workflows/build-release-windows.yml b/.github/workflows/build-release-windows.yml index 62b5441..12e0324 100644 --- a/.github/workflows/build-release-windows.yml +++ b/.github/workflows/build-release-windows.yml @@ -10,6 +10,7 @@ on: jobs: build_windows: + name: Build Windows App runs-on: windows-latest steps: - uses: actions/checkout@v2 From 8ce5a238ee0d985e48f3de7d6c4574e2255dd719 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 17:07:39 +0000 Subject: [PATCH 31/61] debugging --- .github/workflows/build-release-all.yml | 72 ++++++++++++------------- .github/workflows/build-release-mac.yml | 1 + 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index b9411df..3021e1f 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -7,44 +7,44 @@ on: jobs: - build-windows: - name: Build and release Windows Version - uses: ./.github/workflows/build-release-windows.yml - with: - version: ${{ github.ref }} - build-linux: - name: Build and release Linux Version - uses: ./.github/workflows/build-release-linux.yml - with: - version: ${{ github.ref }} +# build-windows: +# name: Build and release Windows Version +# uses: ./.github/workflows/build-release-windows.yml +# with: +# version: ${{ github.ref }} +# build-linux: +# name: Build and release Linux Version +# uses: ./.github/workflows/build-release-linux.yml +# with: +# version: ${{ github.ref }} build-mac: name: Build and release Linux Version uses: ./.github/workflows/build-release-mac.yml with: version: ${{ github.ref }} - update-linux-installer: - name: Update linux installer file - needs: - - build-windows - - build-linux - - build-mac - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: pwd && ls -la - - name: Get Version - id: get_version - uses: battila7/get-version-action@v2.2.1 - - run: sed -i "s/__VERSION__/${{ steps.get_version.outputs.version}}/g" ./CutCode_linux_x64_installer.sh - - name: Upload linux installer file - id: upload-release-asset - uses: svenstaro/upload-release-action@v2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./CutCode_linux_x64_installer.sh - asset_name: CutCode_linux_x64_installer.sh - tag: ${{ github.ref }} - - \ No newline at end of file +# update-linux-installer: +# name: Update linux installer file +# needs: +## - build-windows +## - build-linux +# - build-mac +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v2 +# - run: pwd && ls -la +# - name: Get Version +# id: get_version +# uses: battila7/get-version-action@v2.2.1 +# - run: sed -i "s/__VERSION__/${{ steps.get_version.outputs.version}}/g" ./CutCode_linux_x64_installer.sh +# - name: Upload linux installer file +# id: upload-release-asset +# uses: svenstaro/upload-release-action@v2 +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# with: +# repo_token: ${{ secrets.GITHUB_TOKEN }} +# file: ./CutCode_linux_x64_installer.sh +# asset_name: CutCode_linux_x64_installer.sh +# tag: ${{ github.ref }} +# +# \ No newline at end of file diff --git a/.github/workflows/build-release-mac.yml b/.github/workflows/build-release-mac.yml index 08a8ff1..1a51f34 100644 --- a/.github/workflows/build-release-mac.yml +++ b/.github/workflows/build-release-mac.yml @@ -26,6 +26,7 @@ jobs: dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-x64 -property:Configuration=Release mkdir Assets/logo.iconset cp Assets/Images/logo.png Assets/logo.iconset/icon_512x512.png + ls Assets/logo.iconset iconutil -c icns Assets/logo.iconset cp Assets/logo.icns bin/Release/net6/osx-x64/publish/CutCode.app/Contents/Resources/logo.icns rm Assets/logo.icns From 6b62833ef64fd5e23d69902905fa883a5f9979d2 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 20:58:47 +0000 Subject: [PATCH 32/61] test --- .github/workflows/build-release-mac.yml | 38 +++++++++++++------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-release-mac.yml b/.github/workflows/build-release-mac.yml index 1a51f34..85f813a 100644 --- a/.github/workflows/build-release-mac.yml +++ b/.github/workflows/build-release-mac.yml @@ -7,6 +7,8 @@ on: description: 'The version for the manual flow' required: true type: string + workflow_dispatch: + jobs: build_mac: @@ -21,27 +23,27 @@ jobs: dotnet-version: 6.0.x - name: Build Mac App run: | - cd CutCode.CrossPlatform - dotnet restore -r osx-x64 - dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-x64 -property:Configuration=Release +# cd CutCode.CrossPlatform +# dotnet restore -r osx-x64 +# dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-x64 -property:Configuration=Release mkdir Assets/logo.iconset cp Assets/Images/logo.png Assets/logo.iconset/icon_512x512.png ls Assets/logo.iconset - iconutil -c icns Assets/logo.iconset + iconutil --convert icns Assets/logo.iconset cp Assets/logo.icns bin/Release/net6/osx-x64/publish/CutCode.app/Contents/Resources/logo.icns rm Assets/logo.icns rm -rf Assets/logo.iconset - - name: Archive Artifact - run: | - cd CutCode.CrossPlatform/bin/Release/net6.0/osx-x64/publish - zip -r CutCodeMac.zip CutCode.app - - name: Upload Archive - id: upload-release-asset - uses: svenstaro/upload-release-action@v2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./CutCode.CrossPlatform/bin/Release/net6.0/osx-x64/publish/CutCodeMac.zip - asset_name: MacBuild.zip - tag: ${{ inputs.version }} \ No newline at end of file +# - name: Archive Artifact +# run: | +# cd CutCode.CrossPlatform/bin/Release/net6.0/osx-x64/publish +# zip -r CutCodeMac.zip CutCode.app +# - name: Upload Archive +# id: upload-release-asset +# uses: svenstaro/upload-release-action@v2 +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# with: +# repo_token: ${{ secrets.GITHUB_TOKEN }} +# file: ./CutCode.CrossPlatform/bin/Release/net6.0/osx-x64/publish/CutCodeMac.zip +# asset_name: MacBuild.zip +# tag: ${{ inputs.version }} \ No newline at end of file From 9d41930151fa031b621f06129b17795bce9a91ec Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 21:00:37 +0000 Subject: [PATCH 33/61] t --- .github/workflows/build-release-mac.yml | 37 ++++++++++++------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-release-mac.yml b/.github/workflows/build-release-mac.yml index 85f813a..d6fc270 100644 --- a/.github/workflows/build-release-mac.yml +++ b/.github/workflows/build-release-mac.yml @@ -7,8 +7,6 @@ on: description: 'The version for the manual flow' required: true type: string - workflow_dispatch: - jobs: build_mac: @@ -16,16 +14,15 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v2 - - name: setup .Net 6 uses: actions/setup-dotnet@v1 with: dotnet-version: 6.0.x - name: Build Mac App run: | -# cd CutCode.CrossPlatform -# dotnet restore -r osx-x64 -# dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-x64 -property:Configuration=Release + cd CutCode.CrossPlatform + dotnet restore -r osx-x64 + dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-x64 -property:Configuration=Release mkdir Assets/logo.iconset cp Assets/Images/logo.png Assets/logo.iconset/icon_512x512.png ls Assets/logo.iconset @@ -33,17 +30,17 @@ jobs: cp Assets/logo.icns bin/Release/net6/osx-x64/publish/CutCode.app/Contents/Resources/logo.icns rm Assets/logo.icns rm -rf Assets/logo.iconset -# - name: Archive Artifact -# run: | -# cd CutCode.CrossPlatform/bin/Release/net6.0/osx-x64/publish -# zip -r CutCodeMac.zip CutCode.app -# - name: Upload Archive -# id: upload-release-asset -# uses: svenstaro/upload-release-action@v2 -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# with: -# repo_token: ${{ secrets.GITHUB_TOKEN }} -# file: ./CutCode.CrossPlatform/bin/Release/net6.0/osx-x64/publish/CutCodeMac.zip -# asset_name: MacBuild.zip -# tag: ${{ inputs.version }} \ No newline at end of file + - name: Archive Artifact + run: | + cd CutCode.CrossPlatform/bin/Release/net6.0/osx-x64/publish + zip -r CutCodeMac.zip CutCode.app + - name: Upload Archive + id: upload-release-asset + uses: svenstaro/upload-release-action@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ./CutCode.CrossPlatform/bin/Release/net6.0/osx-x64/publish/CutCodeMac.zip + asset_name: MacBuild.zip + tag: ${{ inputs.version }} \ No newline at end of file From 36684e7a0915cab03a3fd9fc6711acdb53ba9a86 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 21:02:08 +0000 Subject: [PATCH 34/61] t --- .github/workflows/build-release-mac.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-release-mac.yml b/.github/workflows/build-release-mac.yml index d6fc270..2f64bf1 100644 --- a/.github/workflows/build-release-mac.yml +++ b/.github/workflows/build-release-mac.yml @@ -7,6 +7,8 @@ on: description: 'The version for the manual flow' required: true type: string + workflow_dispatch: + jobs: build_mac: From 667476ff0235a32c6e7e9deeb081af4454f2f549 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 21:37:19 +0000 Subject: [PATCH 35/61] try with sips --- .github/workflows/build-release-mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release-mac.yml b/.github/workflows/build-release-mac.yml index 2f64bf1..6c9c4cb 100644 --- a/.github/workflows/build-release-mac.yml +++ b/.github/workflows/build-release-mac.yml @@ -26,7 +26,7 @@ jobs: dotnet restore -r osx-x64 dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-x64 -property:Configuration=Release mkdir Assets/logo.iconset - cp Assets/Images/logo.png Assets/logo.iconset/icon_512x512.png + sips -z 512 512 Assets/Images/logo.png --out Assets/logo.iconset/icon_512x512.png ls Assets/logo.iconset iconutil --convert icns Assets/logo.iconset cp Assets/logo.icns bin/Release/net6/osx-x64/publish/CutCode.app/Contents/Resources/logo.icns From f71bb32923527d38f25860f2f790864b48fc5d56 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 21:43:31 +0000 Subject: [PATCH 36/61] debugging --- .github/workflows/build-release-mac.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-release-mac.yml b/.github/workflows/build-release-mac.yml index 6c9c4cb..5c0402f 100644 --- a/.github/workflows/build-release-mac.yml +++ b/.github/workflows/build-release-mac.yml @@ -29,6 +29,8 @@ jobs: sips -z 512 512 Assets/Images/logo.png --out Assets/logo.iconset/icon_512x512.png ls Assets/logo.iconset iconutil --convert icns Assets/logo.iconset + ls Assets + ls bin/Release/net6/osx-64/publish cp Assets/logo.icns bin/Release/net6/osx-x64/publish/CutCode.app/Contents/Resources/logo.icns rm Assets/logo.icns rm -rf Assets/logo.iconset From 5e7bbafb5a52d926cd1893d78d782ba60be46c92 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 21:51:06 +0000 Subject: [PATCH 37/61] path should work this time --- .github/workflows/build-release-mac.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-release-mac.yml b/.github/workflows/build-release-mac.yml index 5c0402f..50b73c6 100644 --- a/.github/workflows/build-release-mac.yml +++ b/.github/workflows/build-release-mac.yml @@ -30,8 +30,10 @@ jobs: ls Assets/logo.iconset iconutil --convert icns Assets/logo.iconset ls Assets - ls bin/Release/net6/osx-64/publish - cp Assets/logo.icns bin/Release/net6/osx-x64/publish/CutCode.app/Contents/Resources/logo.icns + ls bin/Release/net6.0/osx-64/publish + ls bin/Release/net6.0/osx-64/publish/CutCode.app + ls bin/Release/net6.0/osx-x64/publish/CutCode.app/Contents/Resources + cp Assets/logo.icns bin/Release/net6.0/osx-x64/publish/CutCode.app/Contents/Resources/logo.icns rm Assets/logo.icns rm -rf Assets/logo.iconset - name: Archive Artifact From a4d467eccdb32cab1edd60f64e94d3f53fb0ee54 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 21:57:19 +0000 Subject: [PATCH 38/61] try again --- .github/workflows/build-release-mac.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-release-mac.yml b/.github/workflows/build-release-mac.yml index 50b73c6..999404d 100644 --- a/.github/workflows/build-release-mac.yml +++ b/.github/workflows/build-release-mac.yml @@ -30,8 +30,8 @@ jobs: ls Assets/logo.iconset iconutil --convert icns Assets/logo.iconset ls Assets - ls bin/Release/net6.0/osx-64/publish - ls bin/Release/net6.0/osx-64/publish/CutCode.app + ls bin/Release/net6.0/osx-x64/publish + ls bin/Release/net6.0/osx-x64/publish/CutCode.app ls bin/Release/net6.0/osx-x64/publish/CutCode.app/Contents/Resources cp Assets/logo.icns bin/Release/net6.0/osx-x64/publish/CutCode.app/Contents/Resources/logo.icns rm Assets/logo.icns From add46db0a024280a09f98f5e28247087e9a33a15 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 22:10:42 +0000 Subject: [PATCH 39/61] testing for pr --- .github/workflows/build-release-mac.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-release-mac.yml b/.github/workflows/build-release-mac.yml index 999404d..e77329c 100644 --- a/.github/workflows/build-release-mac.yml +++ b/.github/workflows/build-release-mac.yml @@ -7,7 +7,6 @@ on: description: 'The version for the manual flow' required: true type: string - workflow_dispatch: jobs: From 0f531f313fe70489bd6f41eb75c51b1eb221e7e5 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Tue, 15 Mar 2022 22:11:49 +0000 Subject: [PATCH 40/61] t --- .github/workflows/build-release-all.yml | 71 ++++++++++++------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 3021e1f..ceff54a 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -7,44 +7,43 @@ on: jobs: -# build-windows: -# name: Build and release Windows Version -# uses: ./.github/workflows/build-release-windows.yml -# with: -# version: ${{ github.ref }} -# build-linux: -# name: Build and release Linux Version -# uses: ./.github/workflows/build-release-linux.yml -# with: -# version: ${{ github.ref }} + build-windows: + name: Build and release Windows Version + uses: ./.github/workflows/build-release-windows.yml + with: + version: ${{ github.ref }} + build-linux: + name: Build and release Linux Version + uses: ./.github/workflows/build-release-linux.yml + with: + version: ${{ github.ref }} build-mac: name: Build and release Linux Version uses: ./.github/workflows/build-release-mac.yml with: version: ${{ github.ref }} -# update-linux-installer: -# name: Update linux installer file -# needs: -## - build-windows -## - build-linux -# - build-mac -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2 -# - run: pwd && ls -la -# - name: Get Version -# id: get_version -# uses: battila7/get-version-action@v2.2.1 -# - run: sed -i "s/__VERSION__/${{ steps.get_version.outputs.version}}/g" ./CutCode_linux_x64_installer.sh -# - name: Upload linux installer file -# id: upload-release-asset -# uses: svenstaro/upload-release-action@v2 -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# with: -# repo_token: ${{ secrets.GITHUB_TOKEN }} -# file: ./CutCode_linux_x64_installer.sh -# asset_name: CutCode_linux_x64_installer.sh -# tag: ${{ github.ref }} -# -# \ No newline at end of file + update-linux-installer: + name: Update linux installer file + needs: + - build-windows + - build-linux + - build-mac + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: pwd && ls -la + - name: Get Version + id: get_version + uses: battila7/get-version-action@v2.2.1 + - run: sed -i "s/__VERSION__/${{ steps.get_version.outputs.version}}/g" ./CutCode_linux_x64_installer.sh + - name: Upload linux installer file + id: upload-release-asset + uses: svenstaro/upload-release-action@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ./CutCode_linux_x64_installer.sh + asset_name: CutCode_linux_x64_installer.sh + tag: ${{ github.ref }} + From ee72de09d5b29a995d03b89873bdcbcf7c3ec053 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 10:09:14 +0000 Subject: [PATCH 41/61] update name of linux build and tar --- CutCode_linux_x64_installer.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CutCode_linux_x64_installer.sh b/CutCode_linux_x64_installer.sh index ade8adf..5793267 100644 --- a/CutCode_linux_x64_installer.sh +++ b/CutCode_linux_x64_installer.sh @@ -1,6 +1,6 @@ BASE_URL="https://github.com/Abdesol/CutCode/releases/download/" VERSION="__VERSION__" -FILE="CutCode.__VERSION__.linux.x64.zip" +FILE="CutCodeLinux.tar.gz" FOLDER="CutCode __VERSION__ linux x64" @@ -16,7 +16,7 @@ cd cutcode-tmp dialog --infobox "installing CutCode..." 20 60 #Get built files and unzip them curl -LO $BASE_URL/$VERSION/$FILE -unzip $FILE +tar -xf $FILE #make directory to put built files into and put the files rm -rf /opt/CutCode/ From 98b3c0107adc14776b49895b6e0a981ef78e3f99 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 10:09:26 +0000 Subject: [PATCH 42/61] cleanup to make it better --- .github/workflows/build-release-all.yml | 36 ++++++++++++--------- .github/workflows/build-release-linux.yml | 13 +++----- .github/workflows/build-release-mac.yml | 13 +++----- .github/workflows/build-release-windows.yml | 13 +++----- 4 files changed, 33 insertions(+), 42 deletions(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index ceff54a..61c40a0 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -3,14 +3,14 @@ on: push: tags: - - 'v*' - + - 'v*' + jobs: build-windows: name: Build and release Windows Version uses: ./.github/workflows/build-release-windows.yml - with: + with: version: ${{ github.ref }} build-linux: name: Build and release Linux Version @@ -31,19 +31,25 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - run: pwd && ls -la - name: Get Version id: get_version uses: battila7/get-version-action@v2.2.1 - - run: sed -i "s/__VERSION__/${{ steps.get_version.outputs.version}}/g" ./CutCode_linux_x64_installer.sh - - name: Upload linux installer file - id: upload-release-asset - uses: svenstaro/upload-release-action@v2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - run: sed -i "s/__VERSION__/${{ steps.get_version.outputs.version}}/g" ./CutCode_linux_x64_installer.sh + - name: Upload installer file + uses: actions/upload-artifact@v3 with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./CutCode_linux_x64_installer.sh - asset_name: CutCode_linux_x64_installer.sh - tag: ${{ github.ref }} - + name: CutCode_linux_x64_installer.sh + path: ./CutCode_linux_x64_installer.sh + create-release: + name: Create Release + needs: + - update-linux-installer + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Get Version + id: get_version + uses: battila7/get-version-action@v2.2.1 + - name: Download artifacts + uses: actions/download-artifact@v3 + - run: ls -la \ No newline at end of file diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index 90d4fe2..de12c77 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -27,13 +27,8 @@ jobs: run: | cd CutCode.CrossPlatform/bin/Release/net6.0/linux-x64 tar -czvf CutCodeLinux.tar.gz publish - - name: Upload Archive - id: upload-release-asset - uses: svenstaro/upload-release-action@v2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Upload Artifact + uses: actions/upload-artifact@v3 with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./CutCode.CrossPlatform/bin/Release/net6.0/linux-x64/CutCodeLinux.tar.gz - asset_name: LinuxBuild.tar.gz - tag: ${{ inputs.version }} + name: LinuxBuild.tar.gz + path: ./CutCode.CrossPlatform/bin/Release/net6.0/linux-x64/CutCodeLinux.tar.gz diff --git a/.github/workflows/build-release-mac.yml b/.github/workflows/build-release-mac.yml index e77329c..c77912b 100644 --- a/.github/workflows/build-release-mac.yml +++ b/.github/workflows/build-release-mac.yml @@ -39,13 +39,8 @@ jobs: run: | cd CutCode.CrossPlatform/bin/Release/net6.0/osx-x64/publish zip -r CutCodeMac.zip CutCode.app - - name: Upload Archive - id: upload-release-asset - uses: svenstaro/upload-release-action@v2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Upload Artifact + uses: actions/upload-artifact@v3 with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./CutCode.CrossPlatform/bin/Release/net6.0/osx-x64/publish/CutCodeMac.zip - asset_name: MacBuild.zip - tag: ${{ inputs.version }} \ No newline at end of file + name: MacBuild.zip + path: ./CutCode.CrossPlatform/bin/Release/net6.0/osx-x64/publish/CutCodeMac.zip \ No newline at end of file diff --git a/.github/workflows/build-release-windows.yml b/.github/workflows/build-release-windows.yml index 12e0324..8bca3a2 100644 --- a/.github/workflows/build-release-windows.yml +++ b/.github/workflows/build-release-windows.yml @@ -27,13 +27,8 @@ jobs: run: | cd CutCode.CrossPlatform/bin/Release/net6.0/win7-x64 powershell Compress-Archive -Path .\publish -DestinationPath WindowsZip.zip - - name: Upload Archive - id: upload-release-asset - uses: svenstaro/upload-release-action@v2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Upload Artifact + uses: actions/upload-artifact@v3 with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./CutCode.CrossPlatform/bin/Release/net6.0/win7-x64/WindowsZip.zip - asset_name: WindowsBuild.zip - tag: ${{ inputs.version }} + name: WindowsBuild.zip + path: ./CutCode.CrossPlatform/bin/Release/net6.0/win7-x64/WindowsZip.zip From 547a19ce5248a740818170189a237f59fd422a1a Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 10:41:01 +0000 Subject: [PATCH 43/61] t --- .github/workflows/build-release-all.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 61c40a0..92b4a5c 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -18,7 +18,7 @@ jobs: with: version: ${{ github.ref }} build-mac: - name: Build and release Linux Version + name: Build and release Mac Version uses: ./.github/workflows/build-release-mac.yml with: version: ${{ github.ref }} @@ -52,4 +52,6 @@ jobs: uses: battila7/get-version-action@v2.2.1 - name: Download artifacts uses: actions/download-artifact@v3 + with: + path: ./Artifacts - run: ls -la \ No newline at end of file From 479ae03928152fbea0b77a840e4cd14144823f51 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 11:03:03 +0000 Subject: [PATCH 44/61] testing with creating release from artifacts and pre-release --- .github/workflows/build-release-all.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 92b4a5c..6b4a499 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -54,4 +54,11 @@ jobs: uses: actions/download-artifact@v3 with: path: ./Artifacts - - run: ls -la \ No newline at end of file + - name: create release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file_glob: true + file: ./Artifacts/* + tag: ${{ github.ref }} + prerelease: true \ No newline at end of file From c27811eed0ca348eff3f9eee9142202b01b05831 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 11:47:10 +0000 Subject: [PATCH 45/61] try again --- .github/workflows/build-release-all.yml | 30 ++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 6b4a499..eedea48 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -42,7 +42,7 @@ jobs: path: ./CutCode_linux_x64_installer.sh create-release: name: Create Release - needs: + needs: - update-linux-installer runs-on: ubuntu-latest steps: @@ -52,13 +52,33 @@ jobs: uses: battila7/get-version-action@v2.2.1 - name: Download artifacts uses: actions/download-artifact@v3 - with: + with: path: ./Artifacts - - name: create release + - name: linux installer + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ./Artifacts/CutCode_linux_x64_installer.sh + tag: ${{ github.ref }} + prerelease: true + - name: linux build + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ./Artifacts/LinuxBuild.tar.gz + tag: ${{ github.ref }} + prerelease: true + - name: Mac build + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ./Artifacts/MacBuild.zip + tag: ${{ github.ref }} + prerelease: true + - name: Windows build uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file_glob: true - file: ./Artifacts/* + file: ./Artifacts/WindowsBuild.zip tag: ${{ github.ref }} prerelease: true \ No newline at end of file From c5c75b6c5b4eb2e0a2952b5c8e2390120fbf3e34 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 12:08:38 +0000 Subject: [PATCH 46/61] try again --- .github/workflows/build-release-all.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index eedea48..37619dd 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -58,27 +58,27 @@ jobs: uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./Artifacts/CutCode_linux_x64_installer.sh + file: /home/runner/work/CutCode/CutCode/Artifacts/CutCode_linux_x64_installer.sh tag: ${{ github.ref }} prerelease: true - name: linux build uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./Artifacts/LinuxBuild.tar.gz + file: /home/runner/work/CutCode/CutCode/Artifacts/LinuxBuild.tar.gz tag: ${{ github.ref }} prerelease: true - name: Mac build uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./Artifacts/MacBuild.zip + file: /home/runner/work/CutCode/CutCode/Artifacts/MacBuild.zip tag: ${{ github.ref }} prerelease: true - name: Windows build uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./Artifacts/WindowsBuild.zip + file: /home/runner/work/CutCode/CutCode/Artifacts/WindowsBuild.zip tag: ${{ github.ref }} prerelease: true \ No newline at end of file From 823ec7d45a151a1dd2b06322665ff425ca0a933f Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 12:24:29 +0000 Subject: [PATCH 47/61] testing with things --- .github/workflows/build-release-all.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 37619dd..05cf6c4 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -56,29 +56,41 @@ jobs: path: ./Artifacts - name: linux installer uses: svenstaro/upload-release-action@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: /home/runner/work/CutCode/CutCode/Artifacts/CutCode_linux_x64_installer.sh + asset_name: CutCode_linux_x64_installer.sh tag: ${{ github.ref }} prerelease: true - name: linux build uses: svenstaro/upload-release-action@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: /home/runner/work/CutCode/CutCode/Artifacts/LinuxBuild.tar.gz + asset_name: LinuxBuild.tar.gz tag: ${{ github.ref }} prerelease: true - name: Mac build uses: svenstaro/upload-release-action@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: /home/runner/work/CutCode/CutCode/Artifacts/MacBuild.zip + asset_name: MacBuild.zip tag: ${{ github.ref }} prerelease: true - name: Windows build uses: svenstaro/upload-release-action@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: /home/runner/work/CutCode/CutCode/Artifacts/WindowsBuild.zip + asset_name: WindowsBuild.zip tag: ${{ github.ref }} prerelease: true \ No newline at end of file From 1fded7b1f8acb0d63293b219ed9bc70c31e4bccc Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 12:33:05 +0000 Subject: [PATCH 48/61] remove pre-release --- .github/workflows/build-release-all.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 05cf6c4..41e679c 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -63,7 +63,6 @@ jobs: file: /home/runner/work/CutCode/CutCode/Artifacts/CutCode_linux_x64_installer.sh asset_name: CutCode_linux_x64_installer.sh tag: ${{ github.ref }} - prerelease: true - name: linux build uses: svenstaro/upload-release-action@v2 env: @@ -73,7 +72,6 @@ jobs: file: /home/runner/work/CutCode/CutCode/Artifacts/LinuxBuild.tar.gz asset_name: LinuxBuild.tar.gz tag: ${{ github.ref }} - prerelease: true - name: Mac build uses: svenstaro/upload-release-action@v2 env: @@ -83,7 +81,6 @@ jobs: file: /home/runner/work/CutCode/CutCode/Artifacts/MacBuild.zip asset_name: MacBuild.zip tag: ${{ github.ref }} - prerelease: true - name: Windows build uses: svenstaro/upload-release-action@v2 env: @@ -92,5 +89,4 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: /home/runner/work/CutCode/CutCode/Artifacts/WindowsBuild.zip asset_name: WindowsBuild.zip - tag: ${{ github.ref }} - prerelease: true \ No newline at end of file + tag: ${{ github.ref }} \ No newline at end of file From ac9a8d5912d6aaec0275864597851869af8025fc Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 12:54:05 +0000 Subject: [PATCH 49/61] debug --- .github/workflows/build-release-all.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 41e679c..d85c4f8 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -54,6 +54,8 @@ jobs: uses: actions/download-artifact@v3 with: path: ./Artifacts + - run: ls -la ./Artifacts + - run: ls -la ./Artifacts/CutCode_linux_x64_installer.sh - name: linux installer uses: svenstaro/upload-release-action@v2 env: From 4b8f4b8b7706d0c0c246cb34cdaf23bdf901f3dc Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 13:25:05 +0000 Subject: [PATCH 50/61] hopefully fix paths --- .github/workflows/build-release-all.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index d85c4f8..de4ff5f 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -54,41 +54,43 @@ jobs: uses: actions/download-artifact@v3 with: path: ./Artifacts - - run: ls -la ./Artifacts - - run: ls -la ./Artifacts/CutCode_linux_x64_installer.sh - name: linux installer uses: svenstaro/upload-release-action@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: /home/runner/work/CutCode/CutCode/Artifacts/CutCode_linux_x64_installer.sh + file: /home/runner/work/CutCode/CutCode/Artifacts/CutCode_linux_x64_installer.sh/CutCode_linux_x64_installer.sh asset_name: CutCode_linux_x64_installer.sh tag: ${{ github.ref }} + prerelease: true - name: linux build uses: svenstaro/upload-release-action@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: /home/runner/work/CutCode/CutCode/Artifacts/LinuxBuild.tar.gz + file: /home/runner/work/CutCode/CutCode/Artifacts/LinuxBuild.tar.gz/LinuxBuild.tar.gz asset_name: LinuxBuild.tar.gz tag: ${{ github.ref }} + prerelease: true - name: Mac build uses: svenstaro/upload-release-action@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: /home/runner/work/CutCode/CutCode/Artifacts/MacBuild.zip + file: /home/runner/work/CutCode/CutCode/Artifacts/MacBuild.zip/MacBuild.zip asset_name: MacBuild.zip tag: ${{ github.ref }} + prerelease: true - name: Windows build uses: svenstaro/upload-release-action@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: /home/runner/work/CutCode/CutCode/Artifacts/WindowsBuild.zip + file: /home/runner/work/CutCode/CutCode/Artifacts/WindowsBuild.zip/WindowsBuild.zip asset_name: WindowsBuild.zip - tag: ${{ github.ref }} \ No newline at end of file + tag: ${{ github.ref }} + prerelease: true \ No newline at end of file From 7722de7b99447102ad2cf515225c4dc16e176cfc Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 15:00:01 +0000 Subject: [PATCH 51/61] debugging --- .github/workflows/build-release-all.yml | 1 + .github/workflows/build-release-linux.yml | 2 +- .github/workflows/build-release-mac.yml | 2 +- .github/workflows/build-release-windows.yml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index de4ff5f..14746ce 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -54,6 +54,7 @@ jobs: uses: actions/download-artifact@v3 with: path: ./Artifacts + - run: ls ./Artifacts - name: linux installer uses: svenstaro/upload-release-action@v2 env: diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index de12c77..ad62261 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -30,5 +30,5 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: LinuxBuild.tar.gz + name: LinuxBuild path: ./CutCode.CrossPlatform/bin/Release/net6.0/linux-x64/CutCodeLinux.tar.gz diff --git a/.github/workflows/build-release-mac.yml b/.github/workflows/build-release-mac.yml index c77912b..ba7ab0d 100644 --- a/.github/workflows/build-release-mac.yml +++ b/.github/workflows/build-release-mac.yml @@ -42,5 +42,5 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: MacBuild.zip + name: MacBuild path: ./CutCode.CrossPlatform/bin/Release/net6.0/osx-x64/publish/CutCodeMac.zip \ No newline at end of file diff --git a/.github/workflows/build-release-windows.yml b/.github/workflows/build-release-windows.yml index 8bca3a2..0b513f6 100644 --- a/.github/workflows/build-release-windows.yml +++ b/.github/workflows/build-release-windows.yml @@ -30,5 +30,5 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: WindowsBuild.zip + name: WindowsBuild path: ./CutCode.CrossPlatform/bin/Release/net6.0/win7-x64/WindowsZip.zip From ba75fb6ecfb8de4e88de375d8c1a4e2a46c72c04 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 15:13:42 +0000 Subject: [PATCH 52/61] debug --- .github/workflows/build-release-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 14746ce..e3576d8 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -54,7 +54,7 @@ jobs: uses: actions/download-artifact@v3 with: path: ./Artifacts - - run: ls ./Artifacts + - run: ls ./Artifacts && ls ./Artifacts/LinuxBuild - name: linux installer uses: svenstaro/upload-release-action@v2 env: From fc78a643a990dfa65e8ce28644d3c1e3e0d9fd63 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 15:23:33 +0000 Subject: [PATCH 53/61] debug --- .github/workflows/build-release-all.yml | 3 +-- .github/workflows/build-release-linux.yml | 1 - .github/workflows/build-release-mac.yml | 1 - .github/workflows/build-release-windows.yml | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index e3576d8..10cbfd5 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -38,7 +38,6 @@ jobs: - name: Upload installer file uses: actions/upload-artifact@v3 with: - name: CutCode_linux_x64_installer.sh path: ./CutCode_linux_x64_installer.sh create-release: name: Create Release @@ -54,7 +53,7 @@ jobs: uses: actions/download-artifact@v3 with: path: ./Artifacts - - run: ls ./Artifacts && ls ./Artifacts/LinuxBuild + - name: ls -la ./Artifacts && echo "sep" && ls -la ./Artifacts/CutCodeLinux.tar.gz - name: linux installer uses: svenstaro/upload-release-action@v2 env: diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index ad62261..e8c3038 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -30,5 +30,4 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: LinuxBuild path: ./CutCode.CrossPlatform/bin/Release/net6.0/linux-x64/CutCodeLinux.tar.gz diff --git a/.github/workflows/build-release-mac.yml b/.github/workflows/build-release-mac.yml index ba7ab0d..d3e91c1 100644 --- a/.github/workflows/build-release-mac.yml +++ b/.github/workflows/build-release-mac.yml @@ -42,5 +42,4 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: MacBuild path: ./CutCode.CrossPlatform/bin/Release/net6.0/osx-x64/publish/CutCodeMac.zip \ No newline at end of file diff --git a/.github/workflows/build-release-windows.yml b/.github/workflows/build-release-windows.yml index 0b513f6..0098003 100644 --- a/.github/workflows/build-release-windows.yml +++ b/.github/workflows/build-release-windows.yml @@ -30,5 +30,4 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: WindowsBuild path: ./CutCode.CrossPlatform/bin/Release/net6.0/win7-x64/WindowsZip.zip From f7f145ec85dd4c4a1c31c00d9f1e9dac32215d71 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 15:27:11 +0000 Subject: [PATCH 54/61] s --- .github/workflows/build-release-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 10cbfd5..f84380d 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -53,7 +53,7 @@ jobs: uses: actions/download-artifact@v3 with: path: ./Artifacts - - name: ls -la ./Artifacts && echo "sep" && ls -la ./Artifacts/CutCodeLinux.tar.gz + - run: ls -la ./Artifacts && echo "sep" && ls -la ./Artifacts/CutCodeLinux.tar.gz - name: linux installer uses: svenstaro/upload-release-action@v2 env: From 311f563f772896d50308624d78ca7b3602084ca8 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 15:49:33 +0000 Subject: [PATCH 55/61] s --- .github/workflows/build-release-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index f84380d..191341a 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -53,7 +53,7 @@ jobs: uses: actions/download-artifact@v3 with: path: ./Artifacts - - run: ls -la ./Artifacts && echo "sep" && ls -la ./Artifacts/CutCodeLinux.tar.gz + - run: ls -la ./Artifacts/artifact - name: linux installer uses: svenstaro/upload-release-action@v2 env: From 7e82773a5029542edb717b2d1b0564f50d547616 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 16:05:07 +0000 Subject: [PATCH 56/61] re-add names --- .github/workflows/build-release-all.yml | 2 +- .github/workflows/build-release-linux.yml | 1 + .github/workflows/build-release-mac.yml | 1 + .github/workflows/build-release-windows.yml | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 191341a..1de2ed3 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -53,7 +53,7 @@ jobs: uses: actions/download-artifact@v3 with: path: ./Artifacts - - run: ls -la ./Artifacts/artifact + - run: ls -R ./Artifacts - name: linux installer uses: svenstaro/upload-release-action@v2 env: diff --git a/.github/workflows/build-release-linux.yml b/.github/workflows/build-release-linux.yml index e8c3038..de12c77 100644 --- a/.github/workflows/build-release-linux.yml +++ b/.github/workflows/build-release-linux.yml @@ -30,4 +30,5 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3 with: + name: LinuxBuild.tar.gz path: ./CutCode.CrossPlatform/bin/Release/net6.0/linux-x64/CutCodeLinux.tar.gz diff --git a/.github/workflows/build-release-mac.yml b/.github/workflows/build-release-mac.yml index d3e91c1..c77912b 100644 --- a/.github/workflows/build-release-mac.yml +++ b/.github/workflows/build-release-mac.yml @@ -42,4 +42,5 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3 with: + name: MacBuild.zip path: ./CutCode.CrossPlatform/bin/Release/net6.0/osx-x64/publish/CutCodeMac.zip \ No newline at end of file diff --git a/.github/workflows/build-release-windows.yml b/.github/workflows/build-release-windows.yml index 0098003..8bca3a2 100644 --- a/.github/workflows/build-release-windows.yml +++ b/.github/workflows/build-release-windows.yml @@ -30,4 +30,5 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3 with: + name: WindowsBuild.zip path: ./CutCode.CrossPlatform/bin/Release/net6.0/win7-x64/WindowsZip.zip From c50430cdcde42406c26794d51619bb40f81d4339 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 16:29:36 +0000 Subject: [PATCH 57/61] paths? --- .github/workflows/build-release-all.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 1de2ed3..59c6f16 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -60,7 +60,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: /home/runner/work/CutCode/CutCode/Artifacts/CutCode_linux_x64_installer.sh/CutCode_linux_x64_installer.sh + file: /home/runner/work/CutCode/CutCode/Artifacts/artifact/CutCode_linux_x64_installer.sh asset_name: CutCode_linux_x64_installer.sh tag: ${{ github.ref }} prerelease: true @@ -70,7 +70,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: /home/runner/work/CutCode/CutCode/Artifacts/LinuxBuild.tar.gz/LinuxBuild.tar.gz + file: /home/runner/work/CutCode/CutCode/Artifacts/LinuxBuild.tar.gz/CutCodeLinux.tar.gz asset_name: LinuxBuild.tar.gz tag: ${{ github.ref }} prerelease: true @@ -80,7 +80,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: /home/runner/work/CutCode/CutCode/Artifacts/MacBuild.zip/MacBuild.zip + file: /home/runner/work/CutCode/CutCode/Artifacts/MacBuild.zip/WindowsZip.zip asset_name: MacBuild.zip tag: ${{ github.ref }} prerelease: true From e4bc6964ab7a139e6a85bfa6111727bd63b1642b Mon Sep 17 00:00:00 2001 From: Sabuto Date: Wed, 16 Mar 2022 16:47:11 +0000 Subject: [PATCH 58/61] should fix paths --- .github/workflows/build-release-all.yml | 4 ++-- .github/workflows/build-release-windows.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-release-all.yml b/.github/workflows/build-release-all.yml index 59c6f16..47a52e6 100644 --- a/.github/workflows/build-release-all.yml +++ b/.github/workflows/build-release-all.yml @@ -80,7 +80,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: /home/runner/work/CutCode/CutCode/Artifacts/MacBuild.zip/WindowsZip.zip + file: /home/runner/work/CutCode/CutCode/Artifacts/MacBuild.zip/CutCodeMac.zip asset_name: MacBuild.zip tag: ${{ github.ref }} prerelease: true @@ -90,7 +90,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: /home/runner/work/CutCode/CutCode/Artifacts/WindowsBuild.zip/WindowsBuild.zip + file: /home/runner/work/CutCode/CutCode/Artifacts/WindowsBuild.zip/CutCodeWindows.zip asset_name: WindowsBuild.zip tag: ${{ github.ref }} prerelease: true \ No newline at end of file diff --git a/.github/workflows/build-release-windows.yml b/.github/workflows/build-release-windows.yml index 8bca3a2..375b1d1 100644 --- a/.github/workflows/build-release-windows.yml +++ b/.github/workflows/build-release-windows.yml @@ -26,9 +26,9 @@ jobs: - name: Archive Artifact run: | cd CutCode.CrossPlatform/bin/Release/net6.0/win7-x64 - powershell Compress-Archive -Path .\publish -DestinationPath WindowsZip.zip + powershell Compress-Archive -Path .\publish -DestinationPath CutCodeWindows.zip - name: Upload Artifact uses: actions/upload-artifact@v3 with: name: WindowsBuild.zip - path: ./CutCode.CrossPlatform/bin/Release/net6.0/win7-x64/WindowsZip.zip + path: ./CutCode.CrossPlatform/bin/Release/net6.0/win7-x64/CutCodeWindows.zip From 25bda3831af2065eb661beaaf113c6c424d42c2f Mon Sep 17 00:00:00 2001 From: Sabuto Date: Thu, 17 Mar 2022 10:58:44 +0000 Subject: [PATCH 59/61] trying to get it to work on mac --- CutCode.CrossPlatform/CutCode.CrossPlatform.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CutCode.CrossPlatform/CutCode.CrossPlatform.csproj b/CutCode.CrossPlatform/CutCode.CrossPlatform.csproj index 02cbabd..5b6aad7 100644 --- a/CutCode.CrossPlatform/CutCode.CrossPlatform.csproj +++ b/CutCode.CrossPlatform/CutCode.CrossPlatform.csproj @@ -22,7 +22,7 @@ 3.0.0 APPL ???? - CutCode + CutCode.CrossPlatform /Assets/logo.icns NSApplication true From 232cedd211260eddc5112d65f70ce41723567a24 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Thu, 17 Mar 2022 11:19:59 +0000 Subject: [PATCH 60/61] try using app host --- .github/workflows/build-release-mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release-mac.yml b/.github/workflows/build-release-mac.yml index c77912b..e5137bb 100644 --- a/.github/workflows/build-release-mac.yml +++ b/.github/workflows/build-release-mac.yml @@ -23,7 +23,7 @@ jobs: run: | cd CutCode.CrossPlatform dotnet restore -r osx-x64 - dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-x64 -property:Configuration=Release + dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-x64 -property:Configuration=Release -p:UseAppHost=true mkdir Assets/logo.iconset sips -z 512 512 Assets/Images/logo.png --out Assets/logo.iconset/icon_512x512.png ls Assets/logo.iconset From 1f9c90cad98bd7b40de2b3e1b86d23d1b2464de4 Mon Sep 17 00:00:00 2001 From: Sabuto Date: Thu, 17 Mar 2022 11:48:44 +0000 Subject: [PATCH 61/61] testing something --- CutCode.CrossPlatform/CutCode.CrossPlatform.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CutCode.CrossPlatform/CutCode.CrossPlatform.csproj b/CutCode.CrossPlatform/CutCode.CrossPlatform.csproj index 5b6aad7..0052bfd 100644 --- a/CutCode.CrossPlatform/CutCode.CrossPlatform.csproj +++ b/CutCode.CrossPlatform/CutCode.CrossPlatform.csproj @@ -20,7 +20,7 @@ com.cutcode 3.0.0 3.0.0 - APPL + AAPL ???? CutCode.CrossPlatform /Assets/logo.icns