From ae501760fc24993b48dadbbca5f731cfd84d7356 Mon Sep 17 00:00:00 2001
From: "Miss Circle (Moxie)" <124418090+moxie-coder@users.noreply.github.com>
Date: Tue, 17 Sep 2024 15:24:18 -0400
Subject: [PATCH 1/6] Update main.yml
---
.github/workflows/main.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 17a3265f..441b6f1d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
- uses: krdlab/setup-haxe@master
with:
- haxe-version: 4.3.0
+ haxe-version: 4.3.6
# Runs a set of commands using the runners shell
- name: Restore existing build cache for faster compilation
uses: actions/cache@v3
@@ -98,7 +98,7 @@ jobs:
- uses: krdlab/setup-haxe@master
with:
- haxe-version: 4.3.0
+ haxe-version: 4.3.6
# Runs a set of commands using the runners shell
- name: Install Haxelib
run: |
@@ -125,7 +125,7 @@ jobs:
- uses: krdlab/setup-haxe@master
with:
- haxe-version: 4.3.0
+ haxe-version: 4.3.6
# Runs a set of commands using the runners shell
- name: Install Haxelib
run: |
From 16faa628374635fbb2d7b3e853312b158aeff10e Mon Sep 17 00:00:00 2001
From: "Miss Circle (Moxie)" <124418090+moxie-coder@users.noreply.github.com>
Date: Tue, 17 Sep 2024 15:32:05 -0400
Subject: [PATCH 2/6] turn this back on for testing
---
Project.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Project.xml b/Project.xml
index b833e7db..da1ef9d9 100644
--- a/Project.xml
+++ b/Project.xml
@@ -89,7 +89,7 @@
-
+
From ee9718b09f9ad8eb332fb5b1a950249f774e6ca6 Mon Sep 17 00:00:00 2001
From: "Miss Circle (Moxie)" <124418090+moxie-coder@users.noreply.github.com>
Date: Tue, 17 Sep 2024 15:46:37 -0400
Subject: [PATCH 3/6] MacOS fix maybe
---
.github/workflows/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0179cb78..e94f6011 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -117,7 +117,7 @@ jobs:
path: 'export/release/linux/bin'
buildMac:
- runs-on: macos-latest
+ runs-on: macos-11
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
From 64ff586400c91485559b5443991913aa39eca6fb Mon Sep 17 00:00:00 2001
From: "Miss Circle (Moxie)" <124418090+moxie-coder@users.noreply.github.com>
Date: Tue, 17 Sep 2024 16:04:58 -0400
Subject: [PATCH 4/6] Matrix versions for Linux & Mac so in case one version
doesn't work
---
.github/workflows/main.yml | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fd45ab5b..e799517d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -89,7 +89,11 @@ jobs:
buildLinux:
# The type of runner that the job will run on
- runs-on: ubuntu-latest
+ runs-on: ubuntu-${{ matrix.version }}
+ strategy:
+ matrix:
+ build: [release]
+ version: [20.04, 22.04]
timeout-minutes: 45
# Steps represent a sequence of tasks that will be executed as part of the job
@@ -116,11 +120,15 @@ jobs:
- name: Publish Artifact
uses: actions/upload-artifact@v4
with:
- name: linuxBuild
- path: 'export/release/linux/bin'
+ name: buildUbuntu${{ matrix.version }}-32-${{ matrix.build }}
+ path: 'export/${{ matrix.build }}/linux/bin'
buildMac:
- runs-on: macos-11
+ runs-on: macos-${{ matrix.version }}
+ strategy:
+ matrix:
+ build: [release]
+ version: [11, 12, 13]
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -143,5 +151,5 @@ jobs:
- name: Publish Artifact
uses: actions/upload-artifact@v4
with:
- name: macBuild
- path: export/release/macos/bin
+ name: buildMac-${{ matrix.version }}-64-${{ matrix.build }}
+ path: 'export/${{ matrix.build }}/macos/bin'
From 848f114a580c25b13dfc5b5cc5693b1f9a0e21fd Mon Sep 17 00:00:00 2001
From: "Miss Circle (Moxie)" <124418090+moxie-coder@users.noreply.github.com>
Date: Tue, 17 Sep 2024 16:09:02 -0400
Subject: [PATCH 5/6] Istg macos
---
.github/workflows/main.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e799517d..befbd74d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -91,6 +91,7 @@ jobs:
# The type of runner that the job will run on
runs-on: ubuntu-${{ matrix.version }}
strategy:
+ fail-fast: false
matrix:
build: [release]
version: [20.04, 22.04]
@@ -126,10 +127,12 @@ jobs:
buildMac:
runs-on: macos-${{ matrix.version }}
strategy:
+ fail-fast: false
matrix:
build: [release]
version: [11, 12, 13]
-
+ timeout-minutes: 45
+
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v4
From a61853891be7117448c2369225d337d112f111c0 Mon Sep 17 00:00:00 2001
From: nebulazorua <12458328+nebulazorua@users.noreply.github.com>
Date: Wed, 18 Sep 2024 06:54:56 +0800
Subject: [PATCH 6/6] no more mac 11
---
.github/workflows/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index befbd74d..67c2d91f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -130,7 +130,7 @@ jobs:
fail-fast: false
matrix:
build: [release]
- version: [11, 12, 13]
+ version: [12, 13]
timeout-minutes: 45
steps: