Skip to content

Commit 5293e1c

Browse files
davidgivendavidgiven
authored
Merge pull request #792 from davidgiven/builds
Make an attempt to switch to WSL 1 for better builds.
2 parents 9ce405c + f200bb8 commit 5293e1c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+10594
-12862
lines changed

‎.github/workflows/ccpp.yml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,28 @@ jobs:
2424
- name: make
2525
run: CXXFLAGS="-Wp,-D_GLIBCXX_ASSERTIONS" make -j`nproc` -C fluxengine
2626

27-
build-linux-debian-11:
28-
runs-on: ubuntu-22.04
29-
container: debian:11
30-
steps:
31-
- uses: actions/checkout@v4
32-
with:
33-
repository: 'davidgiven/fluxengine'
34-
path: 'fluxengine'
35-
- uses: actions/checkout@v4
36-
with:
37-
repository: 'davidgiven/fluxengine-testdata'
38-
path: 'fluxengine-testdata'
39-
- name: apt update
40-
run: apt update
41-
- name: apt
42-
run: >
43-
apt install -y python3 make xz-utils python3 python3-hamcrest
44-
protobuf-compiler libprotobuf-dev libsqlite3-dev
45-
libfmt-dev libprotobuf-dev wx-common pkg-config
46-
libudev-dev g++ libwxgtk3.0-gtk3-dev
47-
- name: make
48-
run: make -C fluxengine
27+
#build-linux-debian-11:
28+
# runs-on: ubuntu-22.04
29+
# container: debian:11
30+
# steps:
31+
# - uses: actions/checkout@v4
32+
# with:
33+
# repository: 'davidgiven/fluxengine'
34+
# path: 'fluxengine'
35+
# - uses: actions/checkout@v4
36+
# with:
37+
# repository: 'davidgiven/fluxengine-testdata'
38+
# path: 'fluxengine-testdata'
39+
# - name: apt update
40+
# run: apt update
41+
# - name: apt
42+
# run: >
43+
# apt install -y python3 make xz-utils python3 python3-hamcrest
44+
# protobuf-compiler libprotobuf-dev libsqlite3-dev
45+
# libfmt-dev libprotobuf-dev wx-common pkg-config
46+
# libudev-dev g++ libwxgtk3.0-gtk3-dev
47+
# - name: make
48+
# run: make -C fluxengine
4949

5050
build-macos-current:
5151
strategy:
@@ -78,15 +78,15 @@ jobs:
7878
steps:
7979
- name: setup WSL
8080
run: |
81-
curl -L https://github.com/WhitewaterFoundry/Fedora-Remix-for-WSL/releases/download/40.1.0/Fedora-Remix-for-WSL-SL_40.1.0.0_x64_arm64.msixbundle -o fedora.msixbundle
82-
unzip fedora.msixbundle Fedora-Remix-for-WSL-SL_40.1.0.0_x64.msix
83-
unzip Fedora-Remix-for-WSL-SL_40.1.0.0_x64.msix install.tar.gz
81+
curl -L https://github.com/WhitewaterFoundry/Fedora-Remix-for-WSL/releases/download/41.0.0/Fedora-Remix-for-WSL-SL_41.0.0.0_x64_arm64.msixbundle -o fedora.msixbundle
82+
unzip fedora.msixbundle Fedora-Remix-for-WSL-SL_41.0.0.0_x64.msix
83+
unzip Fedora-Remix-for-WSL-SL_41.0.0.0_x64.msix install.tar.gz
8484
wsl --update
85-
wsl --set-default-version 2
85+
wsl --set-default-version 1
8686
wsl --import fedora fedora install.tar.gz
8787
wsl --set-default fedora
8888
wsl sh -c 'dnf -y install https://github.com/rpmsphere/noarch/raw/master/r/rpmsphere-release-40-1.noarch.rpm'
89-
wsl sh -c 'dnf -y install --setop=install_weak_deps=False gcc gcc-c++ protobuf-c-compiler protobuf-devel fmt-devel systemd-devel sqlite-devel wxGTK-devel mingw32-gcc mingw32-gcc-c++ mingw32-zlib-static mingw32-protobuf-static mingw32-sqlite-static mingw32-wxWidgets3-static mingw32-libpng-static mingw32-libjpeg-static mingw32-libtiff-static mingw32-nsis png2ico'
89+
wsl sh -c 'dnf -y install gcc gcc-c++ protobuf-c-compiler protobuf-devel fmt-devel systemd-devel sqlite-devel wxGTK-devel mingw32-gcc mingw32-gcc-c++ mingw32-zlib-static mingw32-protobuf-static mingw32-sqlite-static mingw32-wxWidgets3-static mingw32-libpng-static mingw32-libjpeg-static mingw32-libtiff-static mingw32-nsis png2ico'
9090
9191
- name: fix line endings
9292
run: |

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
steps:
1717
- name: setup WSL
1818
run: |
19-
curl -L https://github.com/WhitewaterFoundry/Fedora-Remix-for-WSL/releases/download/40.1.0/Fedora-Remix-for-WSL-SL_40.1.0.0_x64_arm64.msixbundle -o fedora.msixbundle
20-
unzip fedora.msixbundle Fedora-Remix-for-WSL-SL_40.1.0.0_x64.msix
21-
unzip Fedora-Remix-for-WSL-SL_40.1.0.0_x64.msix install.tar.gz
19+
curl -L https://github.com/WhitewaterFoundry/Fedora-Remix-for-WSL/releases/download/41.0.0/Fedora-Remix-for-WSL-SL_41.0.0.0_x64_arm64.msixbundle -o fedora.msixbundle
20+
unzip fedora.msixbundle Fedora-Remix-for-WSL-SL_41.0.0.0_x64.msix
21+
unzip Fedora-Remix-for-WSL-SL_41.0.0.0_x64.msix install.tar.gz
2222
wsl --update
23-
wsl --set-default-version 2
23+
wsl --set-default-version 1
2424
wsl --import fedora fedora install.tar.gz
2525
wsl --set-default fedora
2626
wsl sh -c 'dnf -y install https://github.com/rpmsphere/noarch/raw/master/r/rpmsphere-release-40-1.noarch.rpm'
27-
wsl sh -c 'dnf -y install --setop=install_weak_deps=False gcc gcc-c++ protobuf-c-compiler protobuf-devel fmt-devel systemd-devel sqlite-devel wxGTK-devel mingw32-gcc mingw32-gcc-c++ mingw32-zlib-static mingw32-protobuf-static mingw32-sqlite-static mingw32-wxWidgets3-static mingw32-libpng-static mingw32-libjpeg-static mingw32-libtiff-static mingw32-nsis png2ico'
27+
wsl sh -c 'dnf -y install gcc gcc-c++ protobuf-c-compiler protobuf-devel fmt-devel systemd-devel sqlite-devel wxGTK-devel mingw32-gcc mingw32-gcc-c++ mingw32-zlib-static mingw32-protobuf-static mingw32-sqlite-static mingw32-wxWidgets3-static mingw32-libpng-static mingw32-libjpeg-static mingw32-libtiff-static mingw32-nsis png2ico'
2828
2929
- name: fix line endings
3030
run: |

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export BUILDTYPE
1111
ifeq ($(BUILDTYPE),windows)
1212
MINGW = i686-w64-mingw32-
1313
CC = $(MINGW)gcc
14-
CXX = $(MINGW)g++ -std=c++17
14+
CXX = $(MINGW)g++ -std=c++20
1515
CFLAGS += -g -O3
1616
CXXFLAGS += \
1717
-fext-numeric-literals \

‎arch/aeslanier/decoder.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "lib/core/globals.h"
22
#include "lib/decoders/decoders.h"
3-
#include "aeslanier.h"
3+
#include "arch/aeslanier/aeslanier.h"
44
#include "lib/core/crc.h"
55
#include "lib/data/fluxmap.h"
66
#include "lib/data/fluxmapreader.h"

‎arch/agat/agat.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "lib/core/globals.h"
22
#include "lib/decoders/decoders.h"
3-
#include "agat.h"
3+
#include "arch/agat/agat.h"
44
#include "lib/core/bytes.h"
55
#include "fmt/format.h"
66

‎arch/agat/decoder.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "lib/core/globals.h"
22
#include "lib/decoders/decoders.h"
3-
#include "agat.h"
3+
#include "arch/agat/agat.h"
44
#include "lib/core/crc.h"
55
#include "lib/data/fluxmap.h"
66
#include "lib/data/fluxmapreader.h"

‎arch/agat/encoder.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "lib/core/utils.h"
33
#include "lib/decoders/decoders.h"
44
#include "lib/encoders/encoders.h"
5-
#include "agat.h"
5+
#include "arch/agat/agat.h"
66
#include "lib/core/crc.h"
77
#include "lib/data/image.h"
88
#include "lib/data/layout.h"

‎arch/amiga/amiga.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "lib/core/globals.h"
22
#include "lib/decoders/decoders.h"
3-
#include "amiga.h"
3+
#include "arch/amiga/amiga.h"
44
#include "lib/core/bytes.h"
55
#include "fmt/format.h"
66

‎arch/amiga/decoder.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "protocol.h"
66
#include "lib/decoders/decoders.h"
77
#include "lib/data/sector.h"
8-
#include "amiga.h"
8+
#include "arch/amiga/amiga.h"
99
#include "lib/core/bytes.h"
1010
#include "fmt/format.h"
1111
#include "lib/decoders/decoders.pb.h"

‎arch/amiga/encoder.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "lib/core/utils.h"
33
#include "lib/decoders/decoders.h"
44
#include "lib/encoders/encoders.h"
5-
#include "amiga.h"
5+
#include "arch/amiga/amiga.h"
66
#include "lib/core/crc.h"
77
#include "lib/data/image.h"
88
#include "arch/amiga/amiga.pb.h"

0 commit comments

Comments
 (0)