git.y1.nz

commit 453bf51b5d44d7b6c060d5862a0e86538057e1e9
parent e64fa36573ba45fd6eabcac38bfb11e6e2890970
Author: bbbbbr <bbbbbr@users.noreply.github.com>
Date:   Sat, 12 Feb 2022 11:34:09 -0800

Merge pull request #320 from gbdk-2020/cicd_win32

CI/CD: Build and Package: Win x32 build into develop
Diffstat:
M
.github/workflows/gbdk_build_and_package.yml
39
++++++++++++++++++++++++++++-----------
M
Makefile
3
+++

2 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/gbdk_build_and_package.yml b/.github/workflows/gbdk_build_and_package.yml
@@ -11,12 +11,9 @@ on:
 
 jobs:
   build:
+    runs-on: ${{ matrix.os }}  
     strategy:
       matrix:
-        os:
-          - ubuntu-20.04
-          - macos-10.15
-          - windows-2019
         include:
           - os: ubuntu-20.04
             name: Linux-x64
@@ -24,8 +21,8 @@ jobs:
             name: MacOS-x64
           - os: windows-2019
             name: Windows-x64
-#      fail-fast: false
-    runs-on: ${{ matrix.os }}
+          - os: windows-2019
+            name: Windows-x32
     steps:
 
       # ==== OS Specific Dependencies ====
@@ -57,10 +54,18 @@ jobs:
           # Use patched sms/gg z80 build:
           # For GBDK-2020 4.0.5
           # curl -Lo sdcc.zip https://github.com/gbdk-2020/gbdk-2020-sdcc/releases/download/sdcc-12539-patched/sdcc-x86_64-w64-mingw32-20210711-12539--sms-gg-patched.zip
-          # For GBDK-2020 4.0.6: adds makebin -yN (also seems to trigger AV less)
+          # For GBDK-2020 4.0.6: adds makebin -yN
           curl -Lo sdcc.zip https://github.com/gbdk-2020/gbdk-2020-sdcc/releases/download/sdcc-12539-patched-gbdk0-4.0.6/sdcc-x86_64-w64-mingw32-20210711-12539--sms-gg-patched_makebin_yN.zip
           7z x sdcc.zip
 
+      - name: Windows-x32 Depends
+        if: matrix.name == 'Windows-x32'
+        run: |
+          # Use patched sms/gg z80 build:
+          # For GBDK-2020 4.0.6: adds makebin -yN
+          curl -Lo sdcc.zip https://github.com/gbdk-2020/gbdk-2020-sdcc/releases/download/sdcc-12539-patched-gbdk0-4.0.6/sdcc-i586-mingw32msvc-20210711-12539--sms-gg-patched_makebin_yN.zip
+          7z x sdcc.zip
+
       - name: Windows Depends MSYS2/MinGW64
         if: matrix.name == 'Windows-x64'
         uses: msys2/setup-msys2@v2
@@ -73,6 +78,18 @@ jobs:
             base-devel
             mingw-w64-x86_64-toolchain
 
+      - name: Windows Depends MSYS2/MinGW32
+        if: matrix.name == 'Windows-x32'
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW32
+          path-type: minimal #strict
+          release: false
+          update: false
+          install: >-
+            base-devel
+            mingw-w64-i686-toolchain
+
       # ==== Build Steps ====
       - name: Check out GBDK-2020
         uses: actions/checkout@v2
@@ -90,7 +107,7 @@ jobs:
           echo "BUILD_PACKAGE_FILENAME=gbdk-2020-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV
 
       - name: Pre-Build Windows
-        if: matrix.name == 'Windows-x64'
+        if: (matrix.name == 'Windows-x64') || (matrix.name == 'Windows-x32')
         shell: bash
         run: |
           echo "BUILD_PACKAGE_FILENAME=gbdk-2020-${{ matrix.name }}.zip" >> $GITHUB_ENV
@@ -106,7 +123,7 @@ jobs:
           cd ..
 
       - name: Build GBDK-2020 Windows
-        if: matrix.name == 'Windows-x64'
+        if: (matrix.name == 'Windows-x64') || (matrix.name == 'Windows-x32')
         shell: cmd
         run: |
           set SDCCDIR=%CD%\sdcc
@@ -127,7 +144,7 @@ jobs:
           cd ..
 
       - name: Package build Windows
-        if: matrix.name == 'Windows-x64'
+        if: (matrix.name == 'Windows-x64') || (matrix.name == 'Windows-x32')
         shell: cmd
         run: |
           cd gbdk-2020
@@ -138,7 +155,7 @@ jobs:
           cd ..
 
       - name: Store build
-        if: (matrix.name == 'Linux-64') || (matrix.name == 'MacOS-64') || ('Windows-x64')
+        if: (matrix.name == 'Linux-64') || (matrix.name == 'MacOS-64') || ('Windows-x64') || ('Windows-x32')
         uses: actions/upload-artifact@v2
         with:
           name: ${{ matrix.name }} build
diff --git a/Makefile b/Makefile
@@ -51,6 +51,9 @@ endif
 ifeq ($(TOOLSPREFIX),x86_64-w64-mingw32-)
 	EXEEXTENSION=.exe
 endif
+ifeq ($(OS),Windows_NT)
+	EXEEXTENSION=.exe
+endif
 # Host operating system identifier.
 HOSTOS = $(shell uname -s)
 # Target operating system identifier.  Used in the output zip name.

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.