More gh actions fixes

kiibohd · Oct 12, 2023 · 2f200c9 · 2f200c9
1 parent 72d88da
commit 2f200c9
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,14 +7,18 @@ env:
   deb_packages: >-
     libreadline-dev
     libwxgtk3.0-gtk3-dev
+    wx-common
+    wx3.0-headers
 
 jobs:
   linux:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - name: Fetch tags
+      run: git fetch --prune --unshallow --tags
     - name: Install dependencies
       run: |
         sudo apt-get update
@@ -35,11 +39,13 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+    - name: Fetch tags
+      run: git fetch --prune --unshallow --tags
     - name: Install dependencies
       run: |
         brew update
-        brew install wxmac
+        brew install wxwidgets
     - name: Build
       run: |
         make -j
@@ -55,17 +61,28 @@ jobs:
     runs-on: windows-latest
     strategy:
       fail-fast: false
+      matrix:
+        include:
+          - { sys: mingw32, env: i686 }
     steps:
-    - uses: actions/checkout@v3
-    - uses: numworks/setup-msys2@v1
+    - uses: actions/checkout@v4
+    - name: Fetch tags
+      run: git fetch --prune --unshallow --tags
+    - uses: msys2/setup-msys2@v2
       with:
-        msystem: MSYS32
-    - run: msys2do pacman --noconfirm -S -noconfirm --noprogressbar
-    - run: msys2do pacman --noconfirm -U mingw-w64-*-any.pkg.tar.xz
-    - run: |
+        msystem: ${{matrix.sys}}
+        install: >-
+          base-devel
+          git
+        pacboy: >-
+          toolchain
+          wxwidgets3.2-*
+    - name: Build
+      shell: msys2 {0}
+      run: |
         set MSYSTEM=MINGW32
-        msys2do make -j
-        msys2do make install
+        mingw32-make -j
+        mingw32-make install
         bin/bossac --help
     - uses: actions/upload-artifact@v3
       if: always()

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@
 # Version
 #
 VERSION?=$(shell git describe --tags --dirty)
-WXVERSION=3.2
+WXVERSION=3.0
 
 #
 # Source files
@@ -35,7 +35,7 @@ OS:=$(shell uname -s | cut -c -7)
 #
 ifeq ($(OS),MINGW32)
 # Use wxWindows development branch to work around font scaling issues on Windows
-WXVERSION=3.2
+WXVERSION=3.0
 EXE=.exe
 COMMON_SRCS+=WinSerialPort.cpp WinPortFactory.cpp
 COMMON_LDFLAGS=-Wl,--enable-auto-import -static -static-libstdc++ -static-libgcc
@@ -99,8 +99,8 @@ endif
 #
 ifeq ($(OS),Darwin)
 COMMON_SRCS+=PosixSerialPort.cpp OSXPortFactory.cpp
-COMMON_CXXFLAGS=-arch x86_64 -mmacosx-version-min=10.9
-COMMON_LDFLAGS=-arch x86_64 -mmacosx-version-min=10.9
+COMMON_CXXFLAGS=-arch x86_64 -mmacosx-version-min=11 -std=c++14
+COMMON_LDFLAGS=-arch x86_64 -mmacosx-version-min=11
 APP=BOSSA.app
 DMG=bossa-$(VERSION).dmg
 VOLUME=BOSSA