backmerge dev into message-reporting-pretty (#48)

* change resizable="true" in Project.xml template (#45) * Update CI (#47) * Update CI * fix order --------- Co-authored-by: Cameron Taylor <[email protected]>
HaxeFlixel · Apr 10, 2024 · cbee7fc · cbee7fc
1 parent 2d8289f
commit cbee7fc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,21 +6,32 @@ jobs:
   build:
     strategy:
       matrix:
-        haxe-version: ["4.0.5", stable, nightly]
+        haxe-version: ["4.2.5", "4.3.3", latest]
         target: [html5, hl, neko, flash]
         exclude:
         - {haxe-version: nightly, target: html5}
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
-    - uses: lix-pm/setup-lix@master
-    - uses: actions/checkout@v2
-    - run: haxelib dev flixel-templates .
-    - uses: HaxeFlixel/setup-flixel@master
+    - run: sudo apt-get update
+    - uses: actions/checkout@v3
+
+    - uses: krdlab/setup-haxe@v1
       with:
         haxe-version: ${{matrix.haxe-version}}
+
+    - name: "Configure Haxelib"
+      run: |
+        haxelib setup /home/runner/haxe/haxelib/
+        haxelib install haxelib 4.0.3
+        haxelib dev flixel-templates .
+    
+    - uses: HaxeFlixel/setup-flixel@v1
+      with:
+        haxe-version: current
         flixel-versions: dev
         target: ${{matrix.target}}
+
     - run: |
         cd ${{env.HAXELIB_REPO}}/flixel-tools/git
         npm install

diff --git a/default/Project.xml.tpl b/default/Project.xml.tpl
@@ -19,7 +19,7 @@
 	<window width="${WIDTH}" height="${HEIGHT}" fps="60" background="#000000" hardware="true" vsync="false" />
 
 	<!--HTML5-specific-->
-	<window if="html5" resizable="false" />
+	<window if="html5" resizable="true" />
 
 	<!--Desktop-specific-->
 	<window if="desktop" orientation="landscape" fullscreen="false" resizable="true" />