Skip to content

Commit 1dc77f3

Browse files
move cross files
1 parent eb94e48 commit 1dc77f3

File tree

10 files changed

+10
-14
lines changed

10 files changed

+10
-14
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

.github/workflows/meson_ci.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ jobs:
210210
path: builddir/meson-logs/testlog.txt
211211

212212
build_posix:
213-
name: Build ${{ matrix.distro }} using Docker Images
213+
name: Build on Linux ${{ matrix.distro }}
214214
runs-on: ubuntu-latest
215215

216216
strategy:
@@ -298,39 +298,39 @@ jobs:
298298
if [ "${{ matrix.architecture }}" == "arm" ]; then
299299
echo "CC=arm-linux-gnueabi-gcc" >> $GITHUB_ENV
300300
echo "CXX=arm-linux-gnueabi-g++" >> $GITHUB_ENV
301-
echo "CROSS_FILE=crossfiles/cross_file_arm.txt" >> $GITHUB_ENV
301+
echo "CROSS_FILE=.github/crossfiles/arm.txt" >> $GITHUB_ENV
302302
elif [ "${{ matrix.architecture }}" == "arm64" ]; then
303303
echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
304304
echo "CXX=aarch64-linux-gnu-g++" >> $GITHUB_ENV
305-
echo "CROSS_FILE=crossfiles/cross_file_arm64.txt" >> $GITHUB_ENV
305+
echo "CROSS_FILE=.github/crossfiles/arm64.txt" >> $GITHUB_ENV
306306
elif [ "${{ matrix.architecture }}" == "mips" ]; then
307307
echo "CC=mips-linux-gnu-gcc" >> $GITHUB_ENV
308308
echo "CXX=mips-linux-gnu-g++" >> $GITHUB_ENV
309-
echo "CROSS_FILE=crossfiles/cross_file_mips.txt" >> $GITHUB_ENV
309+
echo "CROSS_FILE=.github/crossfiles/mips.txt" >> $GITHUB_ENV
310310
elif [ "${{ matrix.architecture }}" == "mipsel" ]; then
311311
echo "CC=mipsel-linux-gnu-gcc" >> $GITHUB_ENV
312312
echo "CXX=mipsel-linux-gnu-g++" >> $GITHUB_ENV
313-
echo "CROSS_FILE=crossfiles/cross_file_mipsel.txt" >> $GITHUB_ENV
313+
echo "CROSS_FILE=.github/crossfiles/mipsel.txt" >> $GITHUB_ENV
314314
elif [ "${{ matrix.architecture }}" == "riscv64" ]; then
315315
echo "CC=riscv64-linux-gnu-gcc" >> $GITHUB_ENV
316316
echo "CXX=riscv64-linux-gnu-g++" >> $GITHUB_ENV
317-
echo "CROSS_FILE=crossfiles/cross_file_riscv64.txt" >> $GITHUB_ENV
317+
echo "CROSS_FILE=.github/crossfiles/riscv64.txt" >> $GITHUB_ENV
318318
elif [ "${{ matrix.architecture }}" == "ppc" ]; then
319319
echo "CC=powerpc-linux-gnu-gcc" >> $GITHUB_ENV
320320
echo "CXX=powerpc-linux-gnu-g++" >> $GITHUB_ENV
321-
echo "CROSS_FILE=crossfiles/cross_file_ppc.txt" >> $GITHUB_ENV
321+
echo "CROSS_FILE=.github/crossfiles/ppc.txt" >> $GITHUB_ENV
322322
elif [ "${{ matrix.architecture }}" == "ppc64le" ]; then
323323
echo "CC=powerpc64le-linux-gnu-gcc" >> $GITHUB_ENV
324324
echo "CXX=powerpc64le-linux-gnu-g++" >> $GITHUB_ENV
325-
echo "CROSS_FILE=crossfiles/cross_file_ppc64le.txt" >> $GITHUB_ENV
325+
echo "CROSS_FILE=.github/crossfiles/ppc64le.txt" >> $GITHUB_ENV
326326
elif [ "${{ matrix.architecture }}" == "sparc64" ]; then
327327
echo "CC=sparc64-linux-gnu-gcc" >> $GITHUB_ENV
328328
echo "CXX=sparc64-linux-gnu-g++" >> $GITHUB_ENV
329-
echo "CROSS_FILE=crossfiles/cross_file_sparc64.txt" >> $GITHUB_ENV
329+
echo "CROSS_FILE=.github/crossfiles/sparc64.txt" >> $GITHUB_ENV
330330
elif [ "${{ matrix.architecture }}" == "s390x" ]; then
331331
echo "CC=s390x-linux-gnu-gcc" >> $GITHUB_ENV
332332
echo "CXX=s390x-linux-gnu-g++" >> $GITHUB_ENV
333-
echo "CROSS_FILE=crossfiles/cross_file_s390x.txt" >> $GITHUB_ENV
333+
echo "CROSS_FILE=.github/crossfiles/s390x.txt" >> $GITHUB_ENV
334334
fi
335335
336336
- name: Install Meson
@@ -344,7 +344,3 @@ jobs:
344344
- name: Build the Project
345345
run: |
346346
meson compile -C builddir
347-
348-
- name: Test the Project
349-
run: |
350-
meson test -C builddir -v

0 commit comments

Comments
 (0)