git.y1.nz

commit 720b257a13618e1b3b74c6dacc1656059e69e29f
parent 96f4b2c7f77cb9f464dbd6e893ace645f6a11c3f
Author: Toxa <untoxa@mail.ru>
Date:   Mon, 25 Mar 2024 14:31:16 +0300

Merge branch 'develop' of https://github.com/gbdk-2020/gbdk-2020 into develop

Diffstat:
M
.github/workflows/gbdk_build_and_package.yml
16
++++++++++++----
M
.github/workflows/gbdk_build_examples.yml
16
++++++++++++----

2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/gbdk_build_and_package.yml b/.github/workflows/gbdk_build_and_package.yml
@@ -19,6 +19,8 @@ jobs:
             name: Linux-x64
           - os: macos-11
             name: MacOS-x64
+          - os: macos-14
+            name: MacOS-arm64            
           - os: windows-2019
             name: Windows-x64
           - os: windows-2019
@@ -38,6 +40,12 @@ jobs:
           curl -Lo sdcc.tar.gz https://github.com/gbdk-2020/gbdk-2020-sdcc/releases/download/sdcc-patched-gbdk-4.2.0-Next/sdcc-14635-MacOS-x64.tar.gz
           tar xvfz sdcc.tar.gz
 
+      - name: MacOS ARM Depends
+        if: matrix.name == 'MacOS-arm64'
+        run: |
+          curl -Lo sdcc.tar.gz https://github.com/gbdk-2020/gbdk-2020-sdcc/releases/download/sdcc-patched-gbdk-4.2.0-Next/sdcc-14635-MacOS-arm64.tar.gz
+          tar xvfz sdcc.tar.gz
+
       - name: Windows-x64 Depends
         if: matrix.name == 'Windows-x64'
         run: |
@@ -87,7 +95,7 @@ jobs:
       # Needs to be in a separate step than build so that setting the environment var takes effect
       #
       - name: Pre-Build Linux/MacOS
-        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64')
+        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64') || (matrix.name == 'MacOS-arm64')
         shell: bash
         run: |
           echo "BUILD_PACKAGE_FILENAME=gbdk-2020-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV
@@ -100,7 +108,7 @@ jobs:
 
       # ==== Builds ====
       - name: Build GBDK-2020 Linux/MacOS
-        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64')
+        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64') || (matrix.name == 'MacOS-arm64')
         shell: bash
         run: |
           export SDCCDIR=`pwd`/sdcc
@@ -119,7 +127,7 @@ jobs:
 
       # ==== Packaging ====
       - name: Package build Linux/MacOS
-        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64')
+        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64') || (matrix.name == 'MacOS-arm64')
         shell: bash
         run: |
           cd gbdk-2020
@@ -141,7 +149,7 @@ jobs:
           cd ..
 
       - name: Store build
-        if: (matrix.name == 'Linux-64') || (matrix.name == 'MacOS-64') || ('Windows-x64') || ('Windows-x32')
+        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64') || (matrix.name == 'MacOS-arm64') || ('Windows-x64') || ('Windows-x32')
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.name }} build
diff --git a/.github/workflows/gbdk_build_examples.yml b/.github/workflows/gbdk_build_examples.yml
@@ -19,6 +19,8 @@ jobs:
             name: Linux-x64
           - os: macos-11
             name: MacOS-x64
+          - os: macos-14
+            name: MacOS-arm64            
           - os: windows-2019
             name: Windows-x64
           - os: windows-2019
@@ -38,6 +40,12 @@ jobs:
           curl -Lo sdcc.tar.gz https://github.com/gbdk-2020/gbdk-2020-sdcc/releases/download/sdcc-patched-gbdk-4.2.0-Next/sdcc-14635-MacOS-x64.tar.gz
           tar xvfz sdcc.tar.gz
 
+      - name: MacOS ARM Depends
+        if: matrix.name == 'MacOS-arm64'
+        run: |
+          curl -Lo sdcc.tar.gz https://github.com/gbdk-2020/gbdk-2020-sdcc/releases/download/sdcc-patched-gbdk-4.2.0-Next/sdcc-14635-MacOS-arm64.tar.gz
+          tar xvfz sdcc.tar.gz
+
       - name: Windows-x64 Depends
         if: matrix.name == 'Windows-x64'
         run: |
@@ -87,7 +95,7 @@ jobs:
       # Needs to be in a separate step than build so that setting the environment var takes effect
       #
       - name: Pre-Build Linux/MacOS
-        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64')
+        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64') || (matrix.name == 'MacOS-arm64')
         shell: bash
         run: |
           echo "BUILD_PACKAGE_FILENAME=gbdk-2020-${{ matrix.name }}.tar.gz" >> $GITHUB_ENV
@@ -100,7 +108,7 @@ jobs:
 
       # ==== Builds ====
       - name: Build GBDK-2020 Linux/MacOS
-        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64')
+        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64') || (matrix.name == 'MacOS-arm64')
         shell: bash
         run: |
           export SDCCDIR=`pwd`/sdcc
@@ -143,7 +151,7 @@ jobs:
 
       # ==== Packaging ====
       - name: Package build Linux/MacOS
-        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64')
+        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64') || (matrix.name == 'MacOS-arm64')
         shell: bash
         run: |
           cd gbdk-2020
@@ -165,7 +173,7 @@ jobs:
           cd ..
 
       - name: Store build
-        if: (matrix.name == 'Linux-64') || (matrix.name == 'MacOS-64') || ('Windows-x64') || ('Windows-x32')
+        if: (matrix.name == 'Linux-x64') || (matrix.name == 'MacOS-x64') || (matrix.name == 'MacOS-arm64') || ('Windows-x64') || ('Windows-x32')
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.name }} build

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