From a135557bcbdd39b50cc25cbed162bf7046125ead Mon Sep 17 00:00:00 2001
From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com>
Date: Thu, 22 Jul 2021 14:10:21 +0100
Subject: Add ARM64 Mac CI file

---
 .github/azure-workflows/build-mac-arm64.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .github/azure-workflows/build-mac-arm64.yml

(limited to '.github/azure-workflows/build-mac-arm64.yml')

diff --git a/.github/azure-workflows/build-mac-arm64.yml b/.github/azure-workflows/build-mac-arm64.yml
new file mode 100644
index 0000000..fbcf4b0
--- /dev/null
+++ b/.github/azure-workflows/build-mac-arm64.yml
@@ -0,0 +1,23 @@
+trigger:
+- master
+
+pool:
+  name: Default
+  demands:
+   - agent.name -equals MacStadium-ARM64-Mac
+
+steps:
+- script: mkdir $(Pipeline.Workspace)/build
+  displayName: 'Create build environment'
+
+- script: cmake $(Build.SourcesDirectory) -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DMACOS_BUILD_DMG=ON -DUSE_QT6=ON
+  displayName: 'Configure'
+  workingDirectory: $(Pipeline.Workspace)/build
+  
+- script: make -j$(sysctl -n hw.logicalcpu)
+  displayName: 'Make'
+  workingDirectory: $(Pipeline.Workspace)/build
+
+- publish: $(Pipeline.Workspace)/build/melonDS.dmg
+  artifact: melonDS.dmg
+
-- 
cgit v1.2.3


From 3bada15e46acb5d24464ceadcb2cc760beafe7f8 Mon Sep 17 00:00:00 2001
From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com>
Date: Thu, 22 Jul 2021 14:18:52 +0100
Subject: Use arch -arm64 on ARM64 macOS CI

---
 .github/azure-workflows/build-mac-arm64.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.github/azure-workflows/build-mac-arm64.yml')

diff --git a/.github/azure-workflows/build-mac-arm64.yml b/.github/azure-workflows/build-mac-arm64.yml
index fbcf4b0..465ca9c 100644
--- a/.github/azure-workflows/build-mac-arm64.yml
+++ b/.github/azure-workflows/build-mac-arm64.yml
@@ -10,11 +10,11 @@ steps:
 - script: mkdir $(Pipeline.Workspace)/build
   displayName: 'Create build environment'
 
-- script: cmake $(Build.SourcesDirectory) -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DMACOS_BUILD_DMG=ON -DUSE_QT6=ON
+- script: arch -arm64 cmake $(Build.SourcesDirectory) -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DMACOS_BUILD_DMG=ON -DUSE_QT6=ON
   displayName: 'Configure'
   workingDirectory: $(Pipeline.Workspace)/build
   
-- script: make -j$(sysctl -n hw.logicalcpu)
+- script: arch -arm64 make -j$(sysctl -n hw.logicalcpu)
   displayName: 'Make'
   workingDirectory: $(Pipeline.Workspace)/build
 
-- 
cgit v1.2.3


From efd7d62cec79e92f3e3a3434bc9f930441c067cc Mon Sep 17 00:00:00 2001
From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com>
Date: Thu, 22 Jul 2021 14:20:21 +0100
Subject: Use mkdir -p here

---
 .github/azure-workflows/build-mac-arm64.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github/azure-workflows/build-mac-arm64.yml')

diff --git a/.github/azure-workflows/build-mac-arm64.yml b/.github/azure-workflows/build-mac-arm64.yml
index 465ca9c..4d5f213 100644
--- a/.github/azure-workflows/build-mac-arm64.yml
+++ b/.github/azure-workflows/build-mac-arm64.yml
@@ -7,7 +7,7 @@ pool:
    - agent.name -equals MacStadium-ARM64-Mac
 
 steps:
-- script: mkdir $(Pipeline.Workspace)/build
+- script: mkdir -p $(Pipeline.Workspace)/build
   displayName: 'Create build environment'
 
 - script: arch -arm64 cmake $(Build.SourcesDirectory) -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DMACOS_BUILD_DMG=ON -DUSE_QT6=ON
-- 
cgit v1.2.3


From 3074ee06d73c6076dac9348a678b99beb38f48cc Mon Sep 17 00:00:00 2001
From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com>
Date: Thu, 22 Jul 2021 14:32:06 +0100
Subject: Clean workspace before build

---
 .github/azure-workflows/build-mac-arm64.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to '.github/azure-workflows/build-mac-arm64.yml')

diff --git a/.github/azure-workflows/build-mac-arm64.yml b/.github/azure-workflows/build-mac-arm64.yml
index 4d5f213..721c6ac 100644
--- a/.github/azure-workflows/build-mac-arm64.yml
+++ b/.github/azure-workflows/build-mac-arm64.yml
@@ -6,8 +6,11 @@ pool:
   demands:
    - agent.name -equals MacStadium-ARM64-Mac
 
+workspace:
+  clean: all
+    
 steps:
-- script: mkdir -p $(Pipeline.Workspace)/build
+- script: mkdir $(Pipeline.Workspace)/build
   displayName: 'Create build environment'
 
 - script: arch -arm64 cmake $(Build.SourcesDirectory) -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DMACOS_BUILD_DMG=ON -DUSE_QT6=ON
-- 
cgit v1.2.3