Mercurial > minori

changeset 35:329b7921a6be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ci/osx: use debian instead of alpine for some reason osxcross doesn't support musl libc properly, so we have to use debian also this converts our DOS-style files to Unix-style files because Windows sucks :)
author Paper <mrpapersonic@gmail.com>
date Thu, 21 Sep 2023 11:43:24 -0400
parents bb12ff38b3d1
children 2743011a6042
files .builds/linux.yml .builds/osx.yml .builds/win32.yml .builds/win64.yml include/core/array.h
diffstat 5 files changed, 128 insertions(+), 127 deletions(-) [+]
line wrap: on
line diff
--- a/.builds/linux.yml	Wed Sep 20 13:49:35 2023 -0400
+++ b/.builds/linux.yml	Thu Sep 21 11:43:24 2023 -0400
@@ -1,21 +1,21 @@
-image: alpine/edge
-packages:
-  - qt5-qtbase-dev
-  - cmake
-  - gcc
-  - curl-dev
-sources:
-  - https://hg.sr.ht/~mrpapersonic/minori
-environment:
-  BUILD_SUBMITTER: hg.sr.ht
-tasks:
-  - build: |
-      cd minori
-      mkdir build
-      cd build
-      cmake .. -G "Unix Makefiles"
-      make
-triggers:
-  - action: email
-    condition: failure
+image: alpine/edge
+packages:
+  - qt5-qtbase-dev
+  - cmake
+  - gcc
+  - curl-dev
+sources:
+  - https://hg.sr.ht/~mrpapersonic/minori
+environment:
+  BUILD_SUBMITTER: hg.sr.ht
+tasks:
+  - build: |
+      cd minori
+      mkdir build
+      cd build
+      cmake .. -G "Unix Makefiles"
+      make
+triggers:
+  - action: email
+    condition: failure
     to: Paper <mrpapersonic@gmail.com>
\ No newline at end of file
--- a/.builds/osx.yml	Wed Sep 20 13:49:35 2023 -0400
+++ b/.builds/osx.yml	Thu Sep 21 11:43:24 2023 -0400
@@ -1,33 +1,34 @@
-image: alpine/edge
-packages:
-  - cmake
-  - clang
-  - git
-  - patch
-  - python3
-  - curl-dev
-  - openssl-dev
-  - xz-dev
-  - libxml2-dev
-  - bzip2
-  - cpio
-  - libbz2
-  - zlib-dev
-  - wget
-sources:
-  - https://hg.sr.ht/~mrpapersonic/minori
-  - https://github.com/tpoechtrager/osxcross
-tasks:
-  - build: |
-      cd osxcross/tarballs
-      wget "https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.13.sdk.tar.xz"
-      cd ..
-      UNATTENDED=1 ./build.sh
-      export PATH="$(pwd)/target/bin:$PATH"
-      osxcross-macports -v install qt5-qtbase curl pkgconfig
-      export PKG_CONFIG_PATH="$(pwd)/target/macports/pkgs/opt/local/lib/pkgconfig"
-      cd ../minori
-      mkdir build
-      cd build
-      cmake .. -G "Unix Makefiles" -DCMAKE_SYSTEM_NAME="Darwin" -DCMAKE_C_COMPILER="o64-clang" -DCMAKE_CXX_COMPILER="o64-clang++" -DCMAKE_FIND_ROOT_PATH="$(pwd)/../../osxcross/target/macports/pkgs/opt/local/" -DCMAKE_OSX_SYSROOT="$(pwd)/../../osxcross/target/SDK/MacOSX10.13.sdk/"
-      make
+image: debian/stable
+packages:
+  - cmake
+  - clang
+  - git
+  - patch
+  - python3
+  - libssl-dev
+  - lzma-dev
+  - libxml2-dev
+  - xz
+  - bzip2
+  - cpio
+  - libbz2
+  - zlib1g-dev
+  - llvm-dev
+  - uuid-dev
+sources:
+  - https://hg.sr.ht/~mrpapersonic/minori
+  - https://github.com/tpoechtrager/osxcross
+tasks:
+  - build: |
+      cd osxcross/tarballs
+      wget "https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.13.sdk.tar.xz"
+      cd ..
+      UNATTENDED=1 ./build.sh
+      export PATH="$(pwd)/target/bin:$PATH"
+      osxcross-macports -v install qt5-qtbase curl pkgconfig
+      export PKG_CONFIG_PATH="$(pwd)/target/macports/pkgs/opt/local/lib/pkgconfig"
+      cd ../minori
+      mkdir build
+      cd build
+      cmake .. -G "Unix Makefiles" -DCMAKE_SYSTEM_NAME="Darwin" -DCMAKE_C_COMPILER="o64-clang" -DCMAKE_CXX_COMPILER="o64-clang++" -DCMAKE_FIND_ROOT_PATH="$(pwd)/../../osxcross/target/macports/pkgs/opt/local/" -DCMAKE_OSX_SYSROOT="$(pwd)/../../osxcross/target/SDK/MacOSX10.13.sdk/"
+      make
--- a/.builds/win32.yml	Wed Sep 20 13:49:35 2023 -0400
+++ b/.builds/win32.yml	Thu Sep 21 11:43:24 2023 -0400
@@ -1,33 +1,33 @@
-image: alpine/edge
-packages:
-  - wget
-  - tar
-  - zstd
-  - gpg
-  - clang
-  - lld
-  - xz
-  - wine
-  - cmake
-  - ncurses
-  - qt5-qtbase-dev
-sources:
-  - https://hg.sr.ht/~mrpapersonic/minori
-  - https://github.com/holyblackcat/quasi-msys2
-environment:
-  BUILD_SUBMITTER: hg.sr.ht
-tasks:
-  - build: |
-      cd quasi-msys2
-      echo MINGW32 >msystem.txt
-      make install _gcc _qt5-base _curl
-      cd ../minori
-      mkdir build
-      cd build
-      sudo mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
-      sudo bash -c 'echo -n 1 >/proc/sys/fs/binfmt_misc/status'
-      bash -c 'source ../../quasi-msys2/env/all.src && export AUTOMOC_EXECUTABLE="$(which moc)" && export AUTORCC_EXECUTABLE="$(which rcc)" && cmake .. -G "Unix Makefiles" && make'
-triggers:
-  - action: email
-    condition: failure
-    to: Paper <mrpapersonic@gmail.com>
+image: alpine/edge
+packages:
+  - wget
+  - tar
+  - zstd
+  - gpg
+  - clang
+  - lld
+  - xz
+  - wine
+  - cmake
+  - ncurses
+  - qt5-qtbase-dev
+sources:
+  - https://hg.sr.ht/~mrpapersonic/minori
+  - https://github.com/holyblackcat/quasi-msys2
+environment:
+  BUILD_SUBMITTER: hg.sr.ht
+tasks:
+  - build: |
+      cd quasi-msys2
+      echo MINGW32 >msystem.txt
+      make install _gcc _qt5-base _curl
+      cd ../minori
+      mkdir build
+      cd build
+      sudo mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
+      sudo bash -c 'echo -n 1 >/proc/sys/fs/binfmt_misc/status'
+      bash -c 'source ../../quasi-msys2/env/all.src && export AUTOMOC_EXECUTABLE="$(which moc)" && export AUTORCC_EXECUTABLE="$(which rcc)" && cmake .. -G "Unix Makefiles" && make'
+triggers:
+  - action: email
+    condition: failure
+    to: Paper <mrpapersonic@gmail.com>
--- a/.builds/win64.yml	Wed Sep 20 13:49:35 2023 -0400
+++ b/.builds/win64.yml	Thu Sep 21 11:43:24 2023 -0400
@@ -1,33 +1,33 @@
-image: alpine/edge
-packages:
-  - wget
-  - tar
-  - zstd
-  - gpg
-  - clang
-  - lld
-  - xz
-  - wine
-  - cmake
-  - ncurses
-  - qt5-qtbase-dev
-sources:
-  - https://hg.sr.ht/~mrpapersonic/minori
-  - https://github.com/holyblackcat/quasi-msys2
-environment:
-  BUILD_SUBMITTER: hg.sr.ht
-tasks:
-  - build: |
-      cd quasi-msys2
-      echo MINGW64 >msystem.txt
-      make install _gcc _qt5-base _curl
-      cd ../minori
-      mkdir build
-      cd build
-      sudo mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
-      sudo bash -c 'echo -n 1 >/proc/sys/fs/binfmt_misc/status'
-      bash -c 'source ../../quasi-msys2/env/all.src && export AUTOMOC_EXECUTABLE="$(which moc)" && export AUTORCC_EXECUTABLE="$(which rcc)" && cmake .. -G "Unix Makefiles" && make'
-triggers:
-  - action: email
-    condition: failure
-    to: Paper <mrpapersonic@gmail.com>
+image: alpine/edge
+packages:
+  - wget
+  - tar
+  - zstd
+  - gpg
+  - clang
+  - lld
+  - xz
+  - wine
+  - cmake
+  - ncurses
+  - qt5-qtbase-dev
+sources:
+  - https://hg.sr.ht/~mrpapersonic/minori
+  - https://github.com/holyblackcat/quasi-msys2
+environment:
+  BUILD_SUBMITTER: hg.sr.ht
+tasks:
+  - build: |
+      cd quasi-msys2
+      echo MINGW64 >msystem.txt
+      make install _gcc _qt5-base _curl
+      cd ../minori
+      mkdir build
+      cd build
+      sudo mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
+      sudo bash -c 'echo -n 1 >/proc/sys/fs/binfmt_misc/status'
+      bash -c 'source ../../quasi-msys2/env/all.src && export AUTOMOC_EXECUTABLE="$(which moc)" && export AUTORCC_EXECUTABLE="$(which rcc)" && cmake .. -G "Unix Makefiles" && make'
+triggers:
+  - action: email
+    condition: failure
+    to: Paper <mrpapersonic@gmail.com>
--- a/include/core/array.h	Wed Sep 20 13:49:35 2023 -0400
+++ b/include/core/array.h	Thu Sep 21 11:43:24 2023 -0400
@@ -1,9 +1,9 @@
-#ifndef __core__array_h
-#define __core__array_h
-
-#ifndef ARRAYSIZE
-#define ARRAYSIZE(x) \
-    (sizeof(x) / sizeof(x[0]))
-#endif
-
+#ifndef __core__array_h
+#define __core__array_h
+
+#ifndef ARRAYSIZE
+#define ARRAYSIZE(x) \
+    (sizeof(x) / sizeof(x[0]))
+#endif
+
 #endif // __core__array_h
\ No newline at end of file