Skip to content

Commit aa3a916

Browse files
CarterLiCarterLi
authored
Merge pull request #2183 from fastfetch-cli/dev
Release: v2.59.0
2 parents b81c4a0 + 6e64b75 commit aa3a916

56 files changed

Lines changed: 845 additions & 353 deletions

Some content is hidden

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

‎.github/workflows/ci.yml‎

Lines changed: 79 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
steps:
1515
- name: checkout repository
16-
uses: actions/checkout@v5
16+
uses: actions/checkout@v6
1717

1818
- name: Install codespell
1919
shell: bash
@@ -32,7 +32,7 @@ jobs:
3232
contents: read
3333
steps:
3434
- name: checkout repository
35-
uses: actions/checkout@v5
35+
uses: actions/checkout@v6
3636

3737
- name: uname -a
3838
run: uname -a
@@ -78,7 +78,7 @@ jobs:
7878
ffversion: ${{ steps.ffversion.outputs.ffversion }}
7979
steps:
8080
- name: checkout repository
81-
uses: actions/checkout@v5
81+
uses: actions/checkout@v6
8282

8383
- name: uname -a
8484
run: uname -a
@@ -102,7 +102,7 @@ jobs:
102102
103103
- name: Initialize CodeQL
104104
if: matrix.arch == 'amd64'
105-
uses: github/codeql-action/init@v3
105+
uses: github/codeql-action/init@v4
106106
with:
107107
languages: c
108108

@@ -114,7 +114,7 @@ jobs:
114114

115115
- name: perform CodeQL analysis
116116
if: matrix.arch == 'amd64'
117-
uses: github/codeql-action/analyze@v3
117+
uses: github/codeql-action/analyze@v4
118118

119119
- name: list features
120120
run: ./fastfetch --list-features
@@ -151,7 +151,7 @@ jobs:
151151
cpack -V
152152
153153
- name: upload artifacts
154-
uses: actions/upload-artifact@v4
154+
uses: actions/upload-artifact@v6
155155
with:
156156
name: fastfetch-linux-${{ matrix.arch }}
157157
path: ./fastfetch-*.*
@@ -164,7 +164,7 @@ jobs:
164164
contents: read
165165
steps:
166166
- name: checkout repository
167-
uses: actions/checkout@v5
167+
uses: actions/checkout@v6
168168

169169
- name: uname -a
170170
run: uname -a
@@ -217,7 +217,7 @@ jobs:
217217
run: ctest --output-on-failure
218218

219219
- name: upload artifacts
220-
uses: actions/upload-artifact@v4
220+
uses: actions/upload-artifact@v6
221221
with:
222222
name: fastfetch-linux-i686
223223
path: ./fastfetch-*.*
@@ -230,7 +230,7 @@ jobs:
230230
contents: read
231231
steps:
232232
- name: checkout repository
233-
uses: actions/checkout@v5
233+
uses: actions/checkout@v6
234234

235235
- name: run VM
236236
uses: uraimo/run-on-arch-action@v3
@@ -257,7 +257,7 @@ jobs:
257257
ctest --output-on-failure
258258
259259
- name: upload artifacts
260-
uses: actions/upload-artifact@v4
260+
uses: actions/upload-artifact@v6
261261
with:
262262
name: fastfetch-linux-armv7l
263263
path: ./fastfetch-*.*
@@ -270,7 +270,7 @@ jobs:
270270
contents: read
271271
steps:
272272
- name: checkout repository
273-
uses: actions/checkout@v5
273+
uses: actions/checkout@v6
274274

275275
- name: run VM
276276
uses: uraimo/run-on-arch-action@v3
@@ -293,7 +293,7 @@ jobs:
293293
ctest --output-on-failure
294294
295295
- name: upload artifacts
296-
uses: actions/upload-artifact@v4
296+
uses: actions/upload-artifact@v6
297297
with:
298298
name: fastfetch-linux-armv6l
299299
path: ./fastfetch-*.*
@@ -312,7 +312,7 @@ jobs:
312312
- arch: s390x
313313
steps:
314314
- name: checkout repository
315-
uses: actions/checkout@v5
315+
uses: actions/checkout@v6
316316

317317
- name: run VM
318318
uses: uraimo/run-on-arch-action@v3
@@ -336,7 +336,7 @@ jobs:
336336
ctest --output-on-failure
337337
338338
- name: upload artifacts
339-
uses: actions/upload-artifact@v4
339+
uses: actions/upload-artifact@v6
340340
with:
341341
name: fastfetch-linux-${{ matrix.arch }}
342342
path: ./fastfetch-*.*
@@ -345,7 +345,7 @@ jobs:
345345
name: Musl-amd64
346346
runs-on: ubuntu-latest
347347
steps:
348-
- uses: actions/checkout@v5
348+
- uses: actions/checkout@v6
349349

350350
- name: setup alpine linux
351351
uses: jirutka/setup-alpine@master
@@ -374,7 +374,7 @@ jobs:
374374
shell: alpine.sh {0}
375375

376376
- name: upload artifacts
377-
uses: actions/upload-artifact@v4
377+
uses: actions/upload-artifact@v6
378378
with:
379379
name: fastfetch-musl-amd64
380380
path: ./fastfetch-*.*
@@ -394,7 +394,7 @@ jobs:
394394
runs-on: macos-latest
395395
steps:
396396
- name: checkout repository
397-
uses: actions/checkout@v5
397+
uses: actions/checkout@v6
398398

399399
- name: uname -a
400400
run: uname -a
@@ -428,17 +428,17 @@ jobs:
428428
run: ctest --output-on-failure
429429

430430
- name: upload artifacts
431-
uses: actions/upload-artifact@v4
431+
uses: actions/upload-artifact@v6
432432
with:
433433
name: fastfetch-macos-${{ matrix.arch }}
434434
path: ./fastfetch-*.*
435435

436-
sunos-amd64:
436+
omnios-amd64:
437437
runs-on: ubuntu-latest
438-
name: SunOS-amd64
438+
name: OmniOS-amd64
439439
steps:
440440
- name: checkout repository
441-
uses: actions/checkout@v5
441+
uses: actions/checkout@v6
442442

443443
- name: run VM
444444
uses: vmactions/omnios-vm@v1
@@ -447,23 +447,59 @@ jobs:
447447
prepare: |
448448
uname -a
449449
pkg update --accept
450-
pkg install gcc14 cmake git pkg-config glib2 dbus sqlite-3 imagemagick
450+
pkg install gcc14 cmake git pkg-config glib2 dbus sqlite-3 imagemagick ninja
451451
452452
run: |
453-
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
454-
cmake --build . --target package --verbose -j4
453+
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -GNinja .
454+
cmake --build . --verbose -j4
455+
./fastfetch --list-features
456+
time ./fastfetch -c presets/ci.jsonc --stat false
457+
time ./fastfetch -c presets/ci.jsonc --format json
458+
time ./flashfetch
459+
ldd fastfetch
460+
ctest --output-on-failure
461+
echo 'set(CPACK_PACKAGE_FILE_NAME "fastfetch-omnios-amd64")' >> CPackConfig.cmake
462+
cpack -V
463+
464+
- name: upload artifacts
465+
uses: actions/upload-artifact@v6
466+
with:
467+
name: fastfetch-omnios-amd64
468+
path: ./fastfetch-*.*
469+
470+
solaris-amd64:
471+
runs-on: ubuntu-latest
472+
name: Solaris-amd64
473+
steps:
474+
- name: checkout repository
475+
uses: actions/checkout@v6
476+
477+
- name: run VM
478+
uses: vmactions/solaris-vm@v1
479+
with:
480+
usesh: true
481+
release: "11.4-gcc-14"
482+
prepare: |
483+
uname -a
484+
pkg install cmake git pkg-config glib2 dbus sqlite-3 imagemagick ninja dconf mesa
485+
486+
run: |
487+
export PKG_CONFIG_PATH=/usr/lib/64/pkgconfig
488+
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -GNinja .
489+
cmake --build . --verbose -j4
455490
./fastfetch --list-features
456491
time ./fastfetch -c presets/ci.jsonc --stat false
457492
time ./fastfetch -c presets/ci.jsonc --format json
458493
time ./flashfetch
459494
ldd fastfetch
460495
ctest --output-on-failure
461-
cpack
496+
echo 'set(CPACK_PACKAGE_FILE_NAME "fastfetch-solaris-amd64")' >> CPackConfig.cmake
497+
cpack -V
462498
463499
- name: upload artifacts
464-
uses: actions/upload-artifact@v4
500+
uses: actions/upload-artifact@v6
465501
with:
466-
name: fastfetch-sunos-amd64
502+
name: fastfetch-solaris-amd64
467503
path: ./fastfetch-*.*
468504

469505
freebsd-amd64:
@@ -474,7 +510,7 @@ jobs:
474510
contents: read
475511
steps:
476512
- name: checkout repository
477-
uses: actions/checkout@v5
513+
uses: actions/checkout@v6
478514

479515
- name: run VM
480516
uses: cross-platform-actions/action@master
@@ -483,7 +519,7 @@ jobs:
483519
architecture: x86-64
484520
cpu_count: 4
485521
shell: bash
486-
version: '14.3'
522+
version: '15.0'
487523
run: |
488524
uname -a
489525
sudo pkg update
@@ -498,7 +534,7 @@ jobs:
498534
ctest --output-on-failure
499535
500536
- name: upload artifacts
501-
uses: actions/upload-artifact@v4
537+
uses: actions/upload-artifact@v6
502538
with:
503539
name: fastfetch-freebsd-amd64
504540
path: ./fastfetch-*.*
@@ -511,7 +547,7 @@ jobs:
511547
contents: read
512548
steps:
513549
- name: checkout repository
514-
uses: actions/checkout@v5
550+
uses: actions/checkout@v6
515551

516552
- name: run VM
517553
uses: cross-platform-actions/action@master
@@ -535,7 +571,7 @@ jobs:
535571
ctest --output-on-failure
536572
537573
- name: upload artifacts
538-
uses: actions/upload-artifact@v4
574+
uses: actions/upload-artifact@v6
539575
with:
540576
name: fastfetch-openbsd-amd64
541577
path: ./fastfetch-*.*
@@ -548,7 +584,7 @@ jobs:
548584
contents: read
549585
steps:
550586
- name: checkout repository
551-
uses: actions/checkout@v5
587+
uses: actions/checkout@v6
552588

553589
- name: run VM
554590
uses: cross-platform-actions/action@master
@@ -571,7 +607,7 @@ jobs:
571607
ctest --output-on-failure
572608
573609
- name: upload artifacts
574-
uses: actions/upload-artifact@v4
610+
uses: actions/upload-artifact@v6
575611
with:
576612
name: fastfetch-netbsd-amd64
577613
path: ./fastfetch-*.*
@@ -584,7 +620,7 @@ jobs:
584620
contents: read
585621
steps:
586622
- name: checkout repository
587-
uses: actions/checkout@v5
623+
uses: actions/checkout@v6
588624

589625
- name: run VM
590626
uses: vmactions/dragonflybsd-vm@v1
@@ -606,7 +642,7 @@ jobs:
606642
ctest --output-on-failure
607643
608644
- name: upload artifacts
609-
uses: actions/upload-artifact@v4
645+
uses: actions/upload-artifact@v6
610646
with:
611647
name: fastfetch-dragonfly-amd64
612648
path: ./fastfetch-*.*
@@ -619,7 +655,7 @@ jobs:
619655
contents: read
620656
steps:
621657
- name: checkout repository
622-
uses: actions/checkout@v5
658+
uses: actions/checkout@v6
623659

624660
- name: run VM
625661
uses: cross-platform-actions/action@master
@@ -641,7 +677,7 @@ jobs:
641677
ctest --output-on-failure
642678
643679
- name: upload artifacts
644-
uses: actions/upload-artifact@v4
680+
uses: actions/upload-artifact@v6
645681
with:
646682
name: fastfetch-haiku-amd64
647683
path: ./fastfetch-*.*
@@ -681,7 +717,7 @@ jobs:
681717
shell: msys2 {0}
682718
steps:
683719
- name: checkout repository
684-
uses: actions/checkout@v5
720+
uses: actions/checkout@v6
685721

686722
- name: setup-msys2
687723
uses: msys2/setup-msys2@v2
@@ -723,7 +759,7 @@ jobs:
723759
- if: github.event_name == 'push' && github.repository == 'fastfetch-cli/fastfetch'
724760
id: upload-unsigned-artifact
725761
name: upload artifacts for signing
726-
uses: actions/upload-artifact@v4
762+
uses: actions/upload-artifact@v6
727763
with:
728764
name: fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}
729765
path: |
@@ -750,7 +786,7 @@ jobs:
750786
run: 7z a -t7z -mx9 -bd -y fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}.7z LICENSE *.dll fastfetch.exe flashfetch.exe presets
751787

752788
- name: upload true artifacts
753-
uses: actions/upload-artifact@v4
789+
uses: actions/upload-artifact@v6
754790
with:
755791
name: fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}
756792
path: ./fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}.*
@@ -772,7 +808,8 @@ jobs:
772808
- openbsd-amd64
773809
- netbsd-amd64
774810
- dragonfly-amd64
775-
- sunos-amd64
811+
- solaris-amd64
812+
- omnios-amd64
776813
- haiku-amd64
777814
- windows-hosts
778815
permissions:

0 commit comments

Comments
 (0)