mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-04-28 13:28:01 +03:00
Add arm64 build, update Qt version and docker image for github actions
This commit is contained in:
parent
49f6c5cdca
commit
c7c45bf2b8
2 changed files with 26 additions and 11 deletions
13
.ci/build-linux-aarch64.sh
Normal file → Executable file
13
.ci/build-linux-aarch64.sh
Normal file → Executable file
|
@ -12,9 +12,16 @@ git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ { print $3
|
||||||
|
|
||||||
mkdir build && cd build || exit 1
|
mkdir build && cd build || exit 1
|
||||||
|
|
||||||
export CC="${CLANG_BINARY}"
|
if [ "$COMPILER" = "gcc" ]; then
|
||||||
export CXX="${CLANGXX_BINARY}"
|
# These are set in the dockerfile
|
||||||
export LINKER="${LLD_BINARY}"
|
export CC="${GCC_BINARY}"
|
||||||
|
export CXX="${GXX_BINARY}"
|
||||||
|
export LINKER=gold
|
||||||
|
else
|
||||||
|
export CC="${CLANG_BINARY}"
|
||||||
|
export CXX="${CLANGXX_BINARY}"
|
||||||
|
export LINKER="${LLD_BINARY}"
|
||||||
|
fi
|
||||||
export CFLAGS="$CFLAGS -fuse-ld=${LINKER}"
|
export CFLAGS="$CFLAGS -fuse-ld=${LINKER}"
|
||||||
export CXXFLAGS="$CXXFLAGS -fuse-ld=${LINKER}"
|
export CXXFLAGS="$CXXFLAGS -fuse-ld=${LINKER}"
|
||||||
|
|
||||||
|
|
24
.github/workflows/rpcs3.yml
vendored
24
.github/workflows/rpcs3.yml
vendored
|
@ -23,10 +23,18 @@ env:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
Linux_Build:
|
Linux_Build:
|
||||||
runs-on: ubuntu-latest
|
|
||||||
strategy:
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
compiler: [clang, gcc]
|
compiler: [clang, gcc]
|
||||||
|
cfg:
|
||||||
|
- os: ubuntu-24.04-arm
|
||||||
|
docker_img: "rpcs3/rpcs3-ci-focal-aarch64:1.0"
|
||||||
|
build_sh: "/rpcs3/.ci/build-linux-aarch64.sh"
|
||||||
|
- os: ubuntu-24.04
|
||||||
|
docker_img: "rpcs3/rpcs3-ci-focal:1.9"
|
||||||
|
build_sh: "/rpcs3/.ci/build-linux.sh"
|
||||||
|
runs-on: ${{ matrix.cfg.os }}
|
||||||
env:
|
env:
|
||||||
CCACHE_DIR: ${{ github.workspace }}/ccache
|
CCACHE_DIR: ${{ github.workspace }}/ccache
|
||||||
CI_HAS_ARTIFACTS: true
|
CI_HAS_ARTIFACTS: true
|
||||||
|
@ -56,19 +64,19 @@ jobs:
|
||||||
|
|
||||||
- name: Docker setup and build
|
- name: Docker setup and build
|
||||||
run: |
|
run: |
|
||||||
docker pull --quiet rpcs3/rpcs3-ci-focal:1.7
|
docker pull --quiet ${{ matrix.cfg.docker_img }}
|
||||||
docker run \
|
docker run \
|
||||||
-v $PWD:/rpcs3 \
|
-v $PWD:/rpcs3 \
|
||||||
--env-file .ci/docker.env \
|
--env-file .ci/docker.env \
|
||||||
-v ${{ env.CCACHE_DIR }}:/root/.ccache \
|
-v ${{ env.CCACHE_DIR }}:/root/.ccache \
|
||||||
-v ${{ github.workspace }}/artifacts:/root/artifacts \
|
-v ${{ github.workspace }}/artifacts:/root/artifacts \
|
||||||
rpcs3/rpcs3-ci-focal:1.7 \
|
${{ matrix.cfg.docker_img }} \
|
||||||
/rpcs3/.ci/build-linux.sh
|
${{ matrix.cfg.build_sh }}
|
||||||
|
|
||||||
- name: Upload artifacts
|
- name: Upload artifacts
|
||||||
uses: actions/upload-artifact@main
|
uses: actions/upload-artifact@main
|
||||||
with:
|
with:
|
||||||
name: RPCS3 for Linux (${{ matrix.compiler }})
|
name: RPCS3 for Linux (${{ runner.arch }}, ${{ matrix.compiler }})
|
||||||
path: ${{ github.workspace }}/build/*.AppImage
|
path: ${{ github.workspace }}/build/*.AppImage
|
||||||
compression-level: 0
|
compression-level: 0
|
||||||
|
|
||||||
|
@ -77,9 +85,9 @@ jobs:
|
||||||
env:
|
env:
|
||||||
COMPILER: msvc
|
COMPILER: msvc
|
||||||
QT_VER_MAIN: '6'
|
QT_VER_MAIN: '6'
|
||||||
QT_VER: '6.6.3'
|
QT_VER: '6.8.1'
|
||||||
QT_VER_MSVC: 'msvc2019'
|
QT_VER_MSVC: 'msvc2022'
|
||||||
QT_DATE: '202403191840'
|
QT_DATE: '202411221531'
|
||||||
VULKAN_VER: '1.3.268.0'
|
VULKAN_VER: '1.3.268.0'
|
||||||
VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
|
VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
|
||||||
CACHE_DIR: ./cache
|
CACHE_DIR: ./cache
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue