Skip to content

Commit e9f6d0b

Browse files
enzo1982enzo1982
committed
Test CI on Ubuntu 22.04.
1 parent 48f26ca commit e9f6d0b

5 files changed

+18
-146
lines changed

‎.github/workflows/continuous-build-linux.yml

+9-16
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,31 @@ jobs:
1212
strategy:
1313
matrix:
1414
include:
15-
- os: ubuntu-20.04
15+
- os: ubuntu-22.04
1616
arch: x86_64
1717
host: x86_64-linux-gnu
1818
pkgarch: amd64
1919
dependencies: g++-multilib nasm wget wine64-tools yasm
2020

21-
- os: ubuntu-20.04
21+
- os: ubuntu-22.04
2222
arch: i686
2323
host: i386-linux-gnu
2424
pkgarch: i386
2525
dependencies: g++-multilib nasm wget wine32-tools yasm
2626

27-
- os: ubuntu-20.04
28-
arch: armhf
29-
host: arm-linux-gnueabihf
30-
pkgarch: armhf
31-
dependencies: g++-arm-linux-gnueabihf nasm qemu qemu-user-static wget yasm
32-
33-
- os: ubuntu-20.04
27+
- os: ubuntu-22.04
3428
arch: aarch64
3529
host: aarch64-linux-gnu
3630
pkgarch: arm64
3731
dependencies: g++-aarch64-linux-gnu nasm qemu qemu-user-static wget yasm
3832

39-
- os: ubuntu-20.04
33+
- os: ubuntu-22.04
4034
arch: riscv64
4135
host: riscv64-linux-gnu
4236
pkgarch: riscv64
4337
dependencies: g++-riscv64-linux-gnu nasm qemu qemu-user-static wget yasm meson
4438

45-
- os: ubuntu-20.04
39+
- os: ubuntu-22.04
4640
arch: ppc64el
4741
host: powerpc64le-linux-gnu
4842
pkgarch: ppc64el
@@ -62,18 +56,17 @@ jobs:
6256
- name: Prepare sources
6357
if: ${{ matrix.arch != 'i686' && matrix.arch != 'x86_64' }}
6458
run: |
65-
echo "deb [arch=${{ matrix.pkgarch }}] http://ports.ubuntu.com/ubuntu-ports focal main restricted" | sudo tee --append /etc/apt/sources.list > /dev/null
66-
echo "deb [arch=${{ matrix.pkgarch }}] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted" | sudo tee --append /etc/apt/sources.list > /dev/null
67-
echo "deb [arch=${{ matrix.pkgarch }}] http://ports.ubuntu.com/ubuntu-ports focal-security main restricted" | sudo tee --append /etc/apt/sources.list > /dev/null
59+
echo "deb [arch=${{ matrix.pkgarch }}] http://ports.ubuntu.com/ubuntu-ports jammy main restricted" | sudo tee --append /etc/apt/sources.list > /dev/null
60+
echo "deb [arch=${{ matrix.pkgarch }}] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted" | sudo tee --append /etc/apt/sources.list > /dev/null
61+
echo "deb [arch=${{ matrix.pkgarch }}] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted" | sudo tee --append /etc/apt/sources.list > /dev/null
6862
sudo sed -i 's/deb http/deb \[arch=amd64,i386\] http/g' /etc/apt/sources.list
6963
sudo sed -i 's/deb mirror/deb \[arch=amd64,i386\] mirror/g' /etc/apt/sources.list
7064
7165
- name: Install dependencies
7266
run: |
7367
sudo apt update
74-
sudo apt install -y --allow-downgrades libgd3=2.2.5-5.2ubuntu2.4 libodbc1=2.3.6-0.1build1 libpcre2-8-0=10.34-7ubuntu0.1 libpcre2-16-0=10.34-7ubuntu0.1 libpcre2-32-0=10.34-7ubuntu0.1 libpcre2-dev=10.34-7ubuntu0.1
7568
sudo apt install -y ${{ matrix.dependencies }}
76-
sudo apt install -y adwaita-icon-theme gnome-icon-theme libasound2-dev:${{ matrix.pkgarch }} libgdk-pixbuf2.0-dev:${{ matrix.pkgarch }} libgtk-3-dev:${{ matrix.pkgarch }} libncurses-dev:${{ matrix.pkgarch }} libpulse-dev:${{ matrix.pkgarch }} libssl-dev:${{ matrix.pkgarch }} libudev-dev:${{ matrix.pkgarch }} libzstd-dev:${{ matrix.pkgarch }}
69+
sudo apt install -y adwaita-icon-theme gnome-icon-theme libasound2-dev:${{ matrix.pkgarch }} libgdk-pixbuf2.0-dev:${{ matrix.pkgarch }} libgtk-3-dev:${{ matrix.pkgarch }} liblzma-dev:${{ matrix.pkgarch }} libncurses-dev:${{ matrix.pkgarch }} libpulse-dev:${{ matrix.pkgarch }} libssl-dev:${{ matrix.pkgarch }} libudev-dev:${{ matrix.pkgarch }} libzstd-dev:${{ matrix.pkgarch }}
7770
7871
- name: Prepare toolchain
7972
if: ${{ matrix.arch != 'i686' && matrix.arch != 'x86_64' }}

‎.github/workflows/continuous-build-macos.yml

-55
This file was deleted.

‎.github/workflows/continuous-build-windows.yml

-62
This file was deleted.

‎.github/workflows/patches/appimage-type2-runtime-build.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ diff -Naur type2-runtime/src/runtime/Makefile type2-runtime-build/src/runtime/Ma
55
GIT_COMMIT := $(shell cat version)
66
-CC = clang
77
-CFLAGS = -std=gnu99 -Os -D_FILE_OFFSET_BITS=64 -DGIT_COMMIT=\"$(GIT_COMMIT)\" -T data_sections.ld -ffunction-sections -fdata-sections -Wl,--gc-sections -static -Wall -Werror -static-pie
8-
-LIBS = -lsquashfuse -lsquashfuse_ll -lzstd -lz -lfuse3
8+
-LIBS = -lsquashfuse -lsquashfuse_ll -lzstd -lz -lfuse3 -lmimalloc
99
+CC = gcc
1010
+CFLAGS = -std=gnu99 -Os -D_FILE_OFFSET_BITS=64 -DGIT_COMMIT=\"$(GIT_COMMIT)\" -T data_sections.ld -ffunction-sections -fdata-sections -Wl,--gc-sections -static -Wall
11-
+LIBS = -lsquashfuse -lsquashfuse_ll -lzstd -lz -lfuse3 -ldl -lpthread
11+
+LIBS = -lsquashfuse -lsquashfuse_ll -lzstd -llzma -lz -lfuse3 -ldl -lpthread
1212

1313
all: runtime
1414

‎.github/workflows/tools/build-appimage

+7-11
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ cd tools
103103
./build-codecs faad2 fdk-aac mp4v2
104104
./build-codecs lame mpg123
105105
./build-codecs libogg opus speex vorbis
106-
./build-codecs flac mac musepack wavpack
106+
./build-codecs flac mac wavpack
107+
#./build-codecs flac mac musepack wavpack
107108
./build-codecs ffmpeg libsndfile
108109
./build-codecs libsamplerate rnnoise rubberband
109110

@@ -132,8 +133,8 @@ cp /usr/local/lib/libvorbisenc.so appdir/codecs/vorbisenc.so
132133
strip --strip-all appdir/codecs/*.so
133134

134135
install -Dm 0755 /usr/local/bin/ffmpeg appdir/codecs/cmdline/ffmpeg
135-
install -Dm 0755 /usr/local/bin/mpcdec appdir/codecs/cmdline/mpcdec
136-
install -Dm 0755 /usr/local/bin/mpcenc appdir/codecs/cmdline/mpcenc
136+
#install -Dm 0755 /usr/local/bin/mpcdec appdir/codecs/cmdline/mpcdec
137+
#install -Dm 0755 /usr/local/bin/mpcenc appdir/codecs/cmdline/mpcenc
137138
install -Dm 0755 /usr/local/bin/wavpack appdir/codecs/cmdline/wavpack
138139
install -Dm 0755 /usr/local/bin/wvunpack appdir/codecs/cmdline/wvunpack
139140

@@ -184,13 +185,8 @@ cp /usr/local/lib/libcdio_cdda.so.2 appdir
184185
cp /usr/local/lib/libcdio_paranoia.so.2 appdir
185186
cp /usr/local/lib/libcurl.so.4 appdir
186187

187-
if [ -f /usr/lib/$HOST/libssl.so.1.1* ]; then
188-
cp -P /usr/lib/$HOST/libcrypto.so.1.1* appdir
189-
cp -P /usr/lib/$HOST/libssl.so.1.1* appdir
190-
else
191-
cp -P /lib/$HOST/libcrypto.so.1.1* appdir
192-
cp -P /lib/$HOST/libssl.so.1.1* appdir
193-
fi
188+
cp -P /usr/lib/$HOST/libcrypto.so.3 appdir
189+
cp -P /usr/lib/$HOST/libssl.so.3 appdir
194190

195191
strip --strip-all appdir/lib*.so*
196192

@@ -238,4 +234,4 @@ else
238234
fi
239235

240236
# Upload AppImage to GitHub
241-
bash .github/workflows/tools/upload-build freac*.AppImage
237+
#bash .github/workflows/tools/upload-build freac*.AppImage

0 commit comments

Comments
 (0)