diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 89afea2e25..d2fe017ef8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,6 +73,12 @@ jobs: - name: uname -a run: uname -a + - name: cat /etc/os-release + run: cat /etc/os-release + + - name: cat /proc/cpuinfo + run: cat /proc/cpuinfo + - name: install required packages run: sudo apt-get update && sudo apt-get install -y libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev python3-requests @@ -125,7 +131,7 @@ jobs: linux-aarch64: name: Linux-aarch64 - runs-on: ubuntu-22.04 + runs-on: ubuntu-22.04-arm permissions: security-events: write contents: read @@ -133,24 +139,45 @@ jobs: - name: checkout repository uses: actions/checkout@v4 - - name: run VM - uses: uraimo/run-on-arch-action@v2 - id: runcmd - with: - arch: aarch64 - distro: ubuntu20.04 - githubToken: ${{ github.token }} - run: | - uname -a - apt-get update && apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev rpm - cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr . - cmake --build . --target package --verbose -j4 - ./fastfetch --list-features - time ./fastfetch -c presets/ci.jsonc --stat false - time ./fastfetch -c presets/ci.jsonc --format json - time ./flashfetch - ldd fastfetch - ctest --output-on-failure + - name: uname -a + run: uname -a + + - name: cat /etc/os-release + run: cat /etc/os-release + + - name: cat /proc/cpuinfo + run: cat /proc/cpuinfo + + - name: install required packages + run: sudo apt-get update && sudo apt-get install -y libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev python3-requests libchafa-dev libddcutil-dev rpm + + - name: configure project + run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DCMAKE_INSTALL_PREFIX=/usr . + + - name: build project + run: cmake --build . --target package --verbose -j4 + + - name: list features + run: ./fastfetch --list-features + + - name: run fastfetch + run: time ./fastfetch -c presets/ci.jsonc --stat false + + - name: run fastfetch --format json + run: time ./fastfetch -c presets/ci.jsonc --format json + + - name: run flashfetch + run: time ./flashfetch + + - name: print dependencies + run: ldd fastfetch + + - name: run tests + run: ctest --output-on-failure + + - name: get fastfetch version + id: ffversion + run: echo "ffversion=$(./fastfetch --version-raw)" >> $GITHUB_OUTPUT - name: upload artifacts uses: actions/upload-artifact@v4 @@ -158,8 +185,8 @@ jobs: name: fastfetch-linux-aarch64 path: ./fastfetch-*.* - linux-armv7: - name: Linux-armv7 + linux-armv7l: + name: Linux-armv7l runs-on: ubuntu-22.04 permissions: security-events: write @@ -194,11 +221,11 @@ jobs: - name: upload artifacts uses: actions/upload-artifact@v4 with: - name: fastfetch-linux-armv7 + name: fastfetch-linux-armv7l path: ./fastfetch-*.* - linux-armv6: - name: Linux-armv6 + linux-armv6l: + name: Linux-armv6l runs-on: ubuntu-22.04 permissions: security-events: write @@ -230,7 +257,7 @@ jobs: - name: upload artifacts uses: actions/upload-artifact@v4 with: - name: fastfetch-linux-armv6 + name: fastfetch-linux-armv6l path: ./fastfetch-*.* linux-riscv64: @@ -591,7 +618,7 @@ jobs: architecture: x86-64 cpu_count: 4 shell: bash - version: '10.0' + version: '10.1' run: | uname -a sudo pkgin -y install cmake git pkgconf wayland vulkan-headers dconf dbus sqlite3 ImageMagick pulseaudio opencl-headers ocl-icd py312-requests @@ -682,8 +709,8 @@ jobs: needs: - linux-amd64 - linux-aarch64 - - linux-armv7 - - linux-armv6 + - linux-armv7l + - linux-armv6l - linux-riscv64 - linux-ppc64le - linux-s390x diff --git a/CHANGELOG.md b/CHANGELOG.md index 68385e8159..1c0f3ef70c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# 2.36.1 + +Changes: +* To use [the native arm64 runner of Github Action](https://github.blog/changelog/2025-01-16-linux-arm64-hosted-runners-now-available-for-free-in-public-repositories-public-preview/), Linux aarch64 binary is built with Ubuntu 22.04 (Glibc 2.35, Debian 12). + +Bugfixes: +* Chimera Linux logo is now displayed correctly (#1554, Logo) + * Regression of 2.36.0 +* Fix building on Haiku + +Logo: +* Fix ALT Linux + # 2.36.0 Bugfixes: diff --git a/CMakeLists.txt b/CMakeLists.txt index 426cd0e0ea..731ba32fe3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url project(fastfetch - VERSION 2.36.0 + VERSION 2.36.1 LANGUAGES C DESCRIPTION "Fast neofetch-like system information tool" HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch" @@ -141,7 +141,7 @@ set(WARNING_FLAGS "-Wall -Wextra -Wconversion -Werror=uninitialized -Werror=retu set(CMAKE_C_STANDARD 11) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS} -Werror=incompatible-pointer-types -Werror=implicit-function-declaration -Werror=int-conversion") -if(WIN32 OR HAIKU OR ENABLE_DIRECTX_HEADERS) +if(WIN32 OR Haiku OR ENABLE_DIRECTX_HEADERS) enable_language(CXX) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}") @@ -1279,6 +1279,8 @@ elseif(NetBSD) target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-char-subscripts") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,/usr/X11R7/lib -Wl,-rpath,/usr/pkg/lib") # ditto +elseif(Haiku) + target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE) endif() if(FreeBSD OR OpenBSD OR NetBSD) diff --git a/README.md b/README.md index ad7f423a00..83a08ef415 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,10 @@ You may also download the program directly from [the GitHub releases page](https * `pkg install fastfetch` +### Nightly + + + ## Build from source See Wiki: https://github.com/fastfetch-cli/fastfetch/wiki/Building diff --git a/debian/changelog b/debian/changelog index 5ebb8ed7ae..b710a7b3ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fastfetch (2.36.0) jammy; urgency=medium + + * Update to 2.36.0 + + -- Carter Li Mon, 10 Feb 2025 10:13:53 +0800 + fastfetch (2.35.0) jammy; urgency=medium * Update to 2.35.0 diff --git a/debian/files b/debian/files index 45ff9c2606..0ec78db679 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -fastfetch_2.35.0_source.buildinfo universe/utils optional +fastfetch_2.36.0_source.buildinfo universe/utils optional diff --git a/src/logo/ascii/altlinux.txt b/src/logo/ascii/altlinux.txt index 55bf892042..1ad2ba60d2 100644 --- a/src/logo/ascii/altlinux.txt +++ b/src/logo/ascii/altlinux.txt @@ -1,7 +1,7 @@ - ############## + ############## ###################### ########################## - ##+$2###$1####################### + ##+$2####$1####################### #####$2#$1*$2###%+$1###################### ########$2%$1*#$2%#####$1################### ##########$2##$1*#*$2#######%+$1############## diff --git a/src/logo/builtin.c b/src/logo/builtin.c index f847c230ac..4dc7bf7499 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -954,9 +954,9 @@ static const FFlogo C[] = { .colorKeys = FF_COLOR_FG_GREEN, .colorTitle = FF_COLOR_FG_WHITE, }, - // Chimera Linux + // Chimera { - .names = {"Chimera Linux"}, + .names = {"Chimera"}, .lines = FASTFETCH_DATATEXT_LOGO_CHIMERA_LINUX, .colors = { FF_COLOR_FG_RED,