Skip to content

Commit

Permalink
Merge pull request #114 from Yazwh0/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
Yazwh0 authored May 12, 2024
2 parents 7c058ec + 3557dc1 commit 8ae216a
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 30 deletions.
52 changes: 25 additions & 27 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build
on:
push:
branches: ["main", "develop"]

jobs:
build-windows:
runs-on: windows-2022
Expand Down Expand Up @@ -39,10 +39,10 @@ jobs:
- name: Save Core Artifacts
uses: actions/upload-artifact@v3
with:
with:
name: EmulatorCore
path: BitMagic.X16Emulator\X16Emulator\EmulatorCore\x64\Release\core.obj

- name: Archive Emulator
uses: thedoctor0/zip-release@0.7.1
with:
Expand All @@ -55,30 +55,30 @@ jobs:
with:
type: 'zip'
filename: 'BitMagic-TheDebugger.Windows.zip'
directory: BitMagic.X16Debugger/X16D/bin/Release/net6.0
directory: BitMagic.X16Debugger/X16D/bin/Release/net6.0

- name: Setup VS Dev
uses: seanmiddleditch/gha-setup-vsdevenv@v4

- name: Build MSI
working-directory: BitMagic.X16Emulator
run: devenv.com BitMagic.X16Emulator.sln /project X16ESetup\X16ESetup.vdproj /build "Release|x64"
# - name: Build MSI
# working-directory: BitMagic.X16Emulator
# run: devenv.com BitMagic.X16Emulator.sln /project X16ESetup\X16ESetup.vdproj /build "Release|x64"

- name: Save Emulator Setup Artifacts
uses: actions/upload-artifact@v3
with:
name: BitMagic-Setup
path: BitMagic.X16Emulator\X16ESetup\Release\X16ESetup.msi
# - name: Save Emulator Setup Artifacts
# uses: actions/upload-artifact@v3
# with:
# name: BitMagic-Setup
# path: BitMagic.X16Emulator\X16ESetup\Release\X16ESetup.msi

- name: Save Emulator Artifacts
uses: actions/upload-artifact@v3
with:
with:
name: BitMagic-TheEmulator
path: BitMagic.X16Emulator/X16E/bin/Release/net6.0/BitMagic-TheEmulator.Windows.zip

- name: Save Debugger Artifacts
uses: actions/upload-artifact@v3
with:
with:
name: BitMagic-TheDebugger
path: BitMagic.X16Debugger/X16D/bin/Release/net6.0/BitMagic-TheDebugger.Windows.zip

Expand All @@ -97,7 +97,7 @@ jobs:
with:
name: EmulatorCore
path: BitMagic.X16Emulator/X16Emulator/EmulatorCoreLinux

- name: Build Core Wrapper
working-directory: BitMagic.X16Emulator/X16Emulator/EmulatorCoreLinux
run: |
Expand All @@ -109,14 +109,14 @@ jobs:
run: |
mkdir -p BitMagic.X16Emulator/X16Emulator/EmulatorCore/x64/Release
cp BitMagic.X16Emulator/X16Emulator/EmulatorCoreLinux/EmulatorCore.so BitMagic.X16Emulator/X16Emulator/EmulatorCore/x64/Release/.
- name: Build Debugger
run: dotnet build 'BitMagic.X16Debugger/X16D/X16D.csproj' /p:configuration=Release --nologo

- name: Copy Wrapper
run: |
cp BitMagic.X16Emulator/X16Emulator/EmulatorCoreLinux/EmulatorCore.so BitMagic.X16Debugger/X16D/bin/Release/net6.0/.
- name: Create Version File
run: |
echo "${{ github.sha }}" > BitMagic.X16Debugger/X16D/bin/Release/net6.0/version.txt
Expand All @@ -129,18 +129,18 @@ jobs:
filename: '../../../../../BitMagic-TheDebugger.Linux.tar.gz'
directory: BitMagic.X16Debugger/X16D/bin/Release/net6.0

- name: Copy artifacts (Setup)
uses: actions/download-artifact@v3
with:
name: BitMagic-Setup
path: .
# - name: Copy artifacts (Setup)
# uses: actions/download-artifact@v3
# with:
# name: BitMagic-Setup
# path: .

- name: Copy artifacts (Debugger)
uses: actions/download-artifact@v3
with:
name: BitMagic-TheDebugger
path: .

- name: Copy artifacts (Emulator)
uses: actions/download-artifact@v3
with:
Expand All @@ -159,7 +159,6 @@ jobs:
BitMagic-TheDebugger.Linux.tar.gz
BitMagic-TheEmulator.Windows.zip
BitMagic-TheDebugger.Windows.zip
X16ESetup.msi
version.txt
- name: Create Github Development Release
Expand All @@ -174,5 +173,4 @@ jobs:
BitMagic-TheDebugger.Linux.tar.gz
BitMagic-TheEmulator.Windows.zip
BitMagic-TheDebugger.Windows.zip
X16ESetup.msi
version.txt
version.txt
2 changes: 1 addition & 1 deletion BitMagic.X16Debugger

0 comments on commit 8ae216a

Please sign in to comment.