Skip to content

Commit 2ed9734

Browse files
committed
remove linux-riscv64 and disable MOD builds
1 parent b6e6793 commit 2ed9734

1 file changed

Lines changed: 55 additions & 76 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 55 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
linux:
2222
strategy:
2323
matrix:
24-
target: [aarch64, armhf, i686, riscv64, x86_64]
24+
target: [aarch64, armhf, i686, x86_64]
2525
runs-on: ubuntu-latest
2626
container:
2727
image: ubuntu:22.04
@@ -54,21 +54,6 @@ jobs:
5454
- name: Setup dependencies
5555
shell: bash
5656
run: |
57-
# workaround for ncurses riscv64 build failure
58-
if [[ "${{ matrix.target }}" = "riscv64" ]]; then
59-
echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | tee -a /etc/apt/sources.list
60-
echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | tee -a /etc/apt/sources.list
61-
echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports jammy-backports main restricted universe multiverse" | tee -a /etc/apt/sources.list
62-
apt-get update -qq
63-
apt-get purge -yqq libncurses-dev
64-
apt-get install -yqq wget
65-
wget \
66-
http://kx.studio/tmp/libtinfo6_6.3-2ubuntu0.1_amd64.deb \
67-
http://kx.studio/tmp/libncurses6_6.3-2ubuntu0.1_amd64.deb \
68-
http://kx.studio/tmp/libncursesw6_6.3-2ubuntu0.1_amd64.deb \
69-
&& dpkg -i *.deb && rm *.deb
70-
apt-get install -yqq libtinfo6:riscv64
71-
fi
7257
./deps/PawPaw/.github/workflows/bootstrap-deps.sh linux-${{ matrix.target }}
7358
apt-get install -yqq wget zip
7459
- name: Setup dependencies (aarch64)
@@ -89,12 +74,6 @@ jobs:
8974
run: |
9075
apt-get install -yqq libsdl2-dev:i386
9176
apt-get clean
92-
- name: Setup dependencies (riscv64)
93-
if: ${{ matrix.target == 'riscv64' }}
94-
shell: bash
95-
run: |
96-
apt-get install -yqq libsdl2-dev:riscv64
97-
apt-get clean
9877
- name: Setup dependencies (x86_64)
9978
if: ${{ matrix.target == 'x86_64' }}
10079
shell: bash
@@ -252,60 +231,60 @@ jobs:
252231
files: |
253232
${{ github.event.repository.name }}-*.pkg
254233
255-
mod-plugin-builder:
256-
strategy:
257-
matrix:
258-
include:
259-
- name: darkglass-anagram
260-
target: darkglass-anagram
261-
- name: modduo
262-
target: modduo-static
263-
extraflags: MODDUO=true
264-
- name: modduox
265-
target: modduox-static
266-
- name: moddwarf
267-
target: moddwarf
268-
runs-on: ubuntu-22.04
269-
steps:
270-
- uses: actions/checkout@v4
271-
with:
272-
submodules: recursive
273-
- name: Set up cache
274-
uses: actions/cache@v4
275-
id: mpb-cache
276-
with:
277-
path: |
278-
~/mod-workdir
279-
key: ${{ matrix.target }}-v${{ env.CACHE_VERSION }}
280-
- name: Set up dependencies
281-
run: |
282-
sudo apt-get update -qq
283-
sudo apt-get install -yqq acl bc curl cvs git mercurial rsync subversion wget bison bzip2 flex gawk gperf gzip help2man nano perl patch tar texinfo unzip automake binutils build-essential cpio libtool libncurses-dev pkg-config python3 libtool-bin liblo-dev qemu-user-static
284-
sudo apt-get install -yqq pandoc texlive-latex-recommended texlive-latex-extra
285-
sudo apt-get clean
286-
- name: Bootstrap toolchain
287-
if: steps.mpb-cache.outputs.cache-hit != 'true'
288-
run: |
289-
git clone --depth=1 https://github.com/moddevices/mod-plugin-builder.git deps/mod-plugin-builder
290-
sed -i "s/CT_LOG_PROGRESS_BAR=y/CT_LOG_PROGRESS_BAR=n/" deps/mod-plugin-builder/toolchain/*.config
291-
$(pwd)/deps/mod-plugin-builder/bootstrap.sh ${{ matrix.target }} minimal && $(pwd)/deps/mod-plugin-builder/.clean-install.sh ${{ matrix.target }}
292-
- name: Build for modaudio
293-
if: steps.mpb-cache.outputs.cache-hit == 'true'
294-
run: |
295-
make HEADLESS=true ${{ matrix.name }}-features
296-
make HEADLESS=true ${{ matrix.extraflags }} ${{ matrix.name }} -j $(nproc)
297-
- name: Set sha8
298-
id: slug
299-
run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
300-
- name: Pack binaries
301-
if: steps.mpb-cache.outputs.cache-hit == 'true'
302-
run: |
303-
tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-${{ matrix.name }}-${{ github.event.pull_request.number || env.SHA8 }}.tar.gz -C bin $(ls bin | grep lv2)
304-
- uses: actions/upload-artifact@v4
305-
with:
306-
name: ${{ github.event.repository.name }}-${{ matrix.name }}-${{ github.event.pull_request.number || env.SHA8 }}
307-
path: |
308-
*.tar.gz
234+
# mod-plugin-builder:
235+
# strategy:
236+
# matrix:
237+
# include:
238+
# - name: darkglass-anagram
239+
# target: darkglass-anagram
240+
# - name: modduo
241+
# target: modduo-static
242+
# extraflags: MODDUO=true
243+
# - name: modduox
244+
# target: modduox-static
245+
# - name: moddwarf
246+
# target: moddwarf
247+
# runs-on: ubuntu-22.04
248+
# steps:
249+
# - uses: actions/checkout@v4
250+
# with:
251+
# submodules: recursive
252+
# - name: Set up cache
253+
# uses: actions/cache@v4
254+
# id: mpb-cache
255+
# with:
256+
# path: |
257+
# ~/mod-workdir
258+
# key: ${{ matrix.target }}-v${{ env.CACHE_VERSION }}
259+
# - name: Set up dependencies
260+
# run: |
261+
# sudo apt-get update -qq
262+
# sudo apt-get install -yqq acl bc curl cvs git mercurial rsync subversion wget bison bzip2 flex gawk gperf gzip help2man nano perl patch tar texinfo unzip automake binutils build-essential cpio libtool libncurses-dev pkg-config python3 libtool-bin liblo-dev qemu-user-static
263+
# sudo apt-get install -yqq pandoc texlive-latex-recommended texlive-latex-extra
264+
# sudo apt-get clean
265+
# - name: Bootstrap toolchain
266+
# if: steps.mpb-cache.outputs.cache-hit != 'true'
267+
# run: |
268+
# git clone --depth=1 https://github.com/moddevices/mod-plugin-builder.git deps/mod-plugin-builder
269+
# sed -i "s/CT_LOG_PROGRESS_BAR=y/CT_LOG_PROGRESS_BAR=n/" deps/mod-plugin-builder/toolchain/*.config
270+
# $(pwd)/deps/mod-plugin-builder/bootstrap.sh ${{ matrix.target }} minimal && $(pwd)/deps/mod-plugin-builder/.clean-install.sh ${{ matrix.target }}
271+
# - name: Build for modaudio
272+
# if: steps.mpb-cache.outputs.cache-hit == 'true'
273+
# run: |
274+
# make HEADLESS=true ${{ matrix.name }}-features
275+
# make HEADLESS=true ${{ matrix.extraflags }} ${{ matrix.name }} -j $(nproc)
276+
# - name: Set sha8
277+
# id: slug
278+
# run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
279+
# - name: Pack binaries
280+
# if: steps.mpb-cache.outputs.cache-hit == 'true'
281+
# run: |
282+
# tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-${{ matrix.name }}-${{ github.event.pull_request.number || env.SHA8 }}.tar.gz -C bin $(ls bin | grep lv2)
283+
# - uses: actions/upload-artifact@v4
284+
# with:
285+
# name: ${{ github.event.repository.name }}-${{ matrix.name }}-${{ github.event.pull_request.number || env.SHA8 }}
286+
# path: |
287+
# *.tar.gz
309288

310289
wasm:
311290
strategy:

0 commit comments

Comments
 (0)