Skip to content

Commit 0c23b28

Browse files
author
WolfTech Innovations
authored
Merge branch 'fastfetch-cli:dev' into dev
2 parents d662568 + a0949c5 commit 0c23b28

File tree

2 files changed

+59
-28
lines changed

2 files changed

+59
-28
lines changed

.github/workflows/ci.yml

Lines changed: 55 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@ jobs:
7373
- name: uname -a
7474
run: uname -a
7575

76+
- name: cat /etc/os-releas
77+
run: cat /etc/os-release
78+
79+
- name: cat /proc/cpuinfo
80+
run: cat /proc/cpuinfo
81+
7682
- name: install required packages
7783
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
7884

@@ -125,41 +131,62 @@ jobs:
125131

126132
linux-aarch64:
127133
name: Linux-aarch64
128-
runs-on: ubuntu-22.04
134+
runs-on: ubuntu-22.04-arm
129135
permissions:
130136
security-events: write
131137
contents: read
132138
steps:
133139
- name: checkout repository
134140
uses: actions/checkout@v4
135141

136-
- name: run VM
137-
uses: uraimo/run-on-arch-action@v2
138-
id: runcmd
139-
with:
140-
arch: aarch64
141-
distro: ubuntu20.04
142-
githubToken: ${{ github.token }}
143-
run: |
144-
uname -a
145-
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
146-
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
147-
cmake --build . --target package --verbose -j4
148-
./fastfetch --list-features
149-
time ./fastfetch -c presets/ci.jsonc --stat false
150-
time ./fastfetch -c presets/ci.jsonc --format json
151-
time ./flashfetch
152-
ldd fastfetch
153-
ctest --output-on-failure
142+
- name: uname -a
143+
run: uname -a
144+
145+
- name: cat /etc/os-releas
146+
run: cat /etc/os-release
147+
148+
- name: cat /proc/cpuinfo
149+
run: cat /proc/cpuinfo
150+
151+
- name: install required packages
152+
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
153+
154+
- name: configure project
155+
run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DCMAKE_INSTALL_PREFIX=/usr .
156+
157+
- name: build project
158+
run: cmake --build . --target package --verbose -j4
159+
160+
- name: list features
161+
run: ./fastfetch --list-features
162+
163+
- name: run fastfetch
164+
run: time ./fastfetch -c presets/ci.jsonc --stat false
165+
166+
- name: run fastfetch --format json
167+
run: time ./fastfetch -c presets/ci.jsonc --format json
168+
169+
- name: run flashfetch
170+
run: time ./flashfetch
171+
172+
- name: print dependencies
173+
run: ldd fastfetch
174+
175+
- name: run tests
176+
run: ctest --output-on-failure
177+
178+
- name: get fastfetch version
179+
id: ffversion
180+
run: echo "ffversion=$(./fastfetch --version-raw)" >> $GITHUB_OUTPUT
154181

155182
- name: upload artifacts
156183
uses: actions/upload-artifact@v4
157184
with:
158185
name: fastfetch-linux-aarch64
159186
path: ./fastfetch-*.*
160187

161-
linux-armv7:
162-
name: Linux-armv7
188+
linux-armv7l:
189+
name: Linux-armv7l
163190
runs-on: ubuntu-22.04
164191
permissions:
165192
security-events: write
@@ -194,11 +221,11 @@ jobs:
194221
- name: upload artifacts
195222
uses: actions/upload-artifact@v4
196223
with:
197-
name: fastfetch-linux-armv7
224+
name: fastfetch-linux-armv7l
198225
path: ./fastfetch-*.*
199226

200-
linux-armv6:
201-
name: Linux-armv6
227+
linux-armv6l:
228+
name: Linux-armv6l
202229
runs-on: ubuntu-22.04
203230
permissions:
204231
security-events: write
@@ -230,7 +257,7 @@ jobs:
230257
- name: upload artifacts
231258
uses: actions/upload-artifact@v4
232259
with:
233-
name: fastfetch-linux-armv6
260+
name: fastfetch-linux-armv6l
234261
path: ./fastfetch-*.*
235262

236263
linux-riscv64:
@@ -591,7 +618,7 @@ jobs:
591618
architecture: x86-64
592619
cpu_count: 4
593620
shell: bash
594-
version: '10.0'
621+
version: '10.1'
595622
run: |
596623
uname -a
597624
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:
682709
needs:
683710
- linux-amd64
684711
- linux-aarch64
685-
- linux-armv7
686-
- linux-armv6
712+
- linux-armv7l
713+
- linux-armv6l
687714
- linux-riscv64
688715
- linux-ppc64le
689716
- linux-s390x

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ You may also download the program directly from [the GitHub releases page](https
7373

7474
* `pkg install fastfetch`
7575

76+
### Nightly
77+
78+
<https://nightly.link/fastfetch-cli/fastfetch/workflows/ci/dev?preview>
79+
7680
## Build from source
7781

7882
See Wiki: https://github.com/fastfetch-cli/fastfetch/wiki/Building

0 commit comments

Comments
 (0)