-
-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
GitHub Actions CI Port #16082
base: master
Are you sure you want to change the base?
GitHub Actions CI Port #16082
Changes from 2 commits
720113e
91ef7e0
9146b3f
ff3ab91
a914120
3000bd5
34f0b8e
cb2464e
e434a5e
9cd3b58
992b010
dddd71f
8eb3db7
f734286
e0a8cea
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,167 @@ | ||
name: Build RPCS3 | ||
|
||
on: | ||
push: | ||
paths-ignore: | ||
- '.cirrus.yml' | ||
- '.azure-pipelines.yml' | ||
- 'README.md' | ||
pull_request: | ||
paths-ignore: | ||
- '.cirrus.yml' | ||
- '.azure-pipelines.yml' | ||
- 'README.md' | ||
workflow_dispatch: | ||
|
||
concurrency: | ||
group: ${{ github.ref }}-${{ github.event_name }} | ||
cancel-in-progress: true | ||
|
||
env: | ||
BUILD_REPOSITORY_NAME: ${{ github.repository }} | ||
BUILD_SOURCEBRANCHNAME: ${{ github.ref_name }} | ||
|
||
jobs: | ||
Linux_Build: | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
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: | ||
CCACHE_DIR: ${{ github.workspace }}/ccache | ||
CI_HAS_ARTIFACTS: true | ||
DEPLOY_APPIMAGE: true | ||
APPDIR: "/rpcs3/build/appdir" | ||
ARTDIR: "/root/artifacts" | ||
RELEASE_MESSAGE: "/rpcs3/GitHubReleaseMessage-${{ matrix.compiler }}.txt" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We shouldn't need to have release messages per-compiler, since we only upload the binaries from one compiler to the GitHub Release. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removed |
||
COMPILER: ${{ matrix.compiler }} | ||
|
||
steps: | ||
- name: Checkout repository | ||
uses: actions/checkout@main | ||
with: | ||
submodules: recursive | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We don't want to checkout any submodules here since we do filtered checkout of submodules in the build script. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removed |
||
fetch-depth: 0 | ||
|
||
- name: Setup Cache | ||
uses: actions/cache@main | ||
with: | ||
path: ${{ env.CCACHE_DIR }} | ||
key: ${{ runner.os }}-ccache-${{ matrix.compiler }} | ||
|
||
- name: Append Compiler version to appimage | ||
run: | | ||
file=".ci/deploy-linux.sh" | ||
sed -i 's/RPCS3_APPIMAGE="rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}_linux64.AppImage"/RPCS3_APPIMAGE="rpcs3-v${COMM_TAG}-${COMM_COUNT}-${COMM_HASH}-${COMPILER}_linux64.AppImage"/g' $file | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why are you changing the output filename here? If we want to change the output filename just change the deploy script. I'm not sure why you're changing it in the first place though. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's to separate the artifacts from being overwritten, i.e clang finishes before gcc, when GCC is uploaded, clang appimage is overwritten. I didn't want to modify script to keep compatibility for other ci There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Well, now that I had a second look at this, it's not needed after all because artifact have compiler name in it |
||
|
||
- name: Docker setup and build | ||
run: | | ||
docker pull --quiet ${{ matrix.cfg.docker_img }} | ||
docker run \ | ||
-v $PWD:/rpcs3 \ | ||
--env-file .ci/docker.env \ | ||
-v ${{ env.CCACHE_DIR }}:/root/.ccache \ | ||
-v ${{ github.workspace }}/artifacts:/root/artifacts \ | ||
${{ matrix.cfg.docker_img }} \ | ||
${{ matrix.cfg.build_sh }} | ||
|
||
- name: Upload artifacts | ||
uses: actions/upload-artifact@main | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not familiar with There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please also only run this step with the same restrictions we use in Azure: There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added if: |
github.event_name != 'pull_request' &&
github.repository == 'RPCS3/rpcs3' &&
github.ref == 'refs/heads/master' &&
matrix.compiler == 'clang' There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Nope, there will have to be a separate step for it. Using appropriate tokens like azure to upload it |
||
with: | ||
name: RPCS3 for Linux (${{ runner.arch }}, ${{ matrix.compiler }}) | ||
path: ${{ github.workspace }}/build/*.AppImage | ||
compression-level: 0 | ||
|
||
Windows_Build: | ||
runs-on: windows-latest | ||
env: | ||
COMPILER: msvc | ||
QT_VER_MAIN: '6' | ||
QT_VER: '6.8.1' | ||
QT_VER_MSVC: 'msvc2022' | ||
QT_DATE: '202411221531' | ||
VULKAN_VER: '1.3.268.0' | ||
VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5' | ||
CACHE_DIR: ./cache | ||
BUILD_ARTIFACTSTAGINGDIRECTORY: ${{ github.workspace }}\build | ||
steps: | ||
|
||
- name: Checkout repository | ||
uses: actions/checkout@main | ||
with: | ||
submodules: recursive | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here, we do a filtered submodule checkout in the setup script. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removed |
||
fetch-depth: 0 | ||
|
||
- name: Setup env | ||
run: | | ||
echo "QTDIR=C:\Qt\${{ env.QT_VER }}\${{ env.QT_VER_MSVC }}_64" >> ${{ github.env }} | ||
echo "VULKAN_SDK=C:\VulkanSDK\${{ env.VULKAN_VER }}" >> ${{ github.env }} | ||
|
||
- name: Get Cache Keys | ||
shell: bash | ||
run: .ci/get_keys-windows.sh | ||
|
||
- name: Setup Cache | ||
uses: actions/cache@main | ||
with: | ||
path: ${{ env.CACHE_DIR }} | ||
key: ${{ runner.os }}-${{ env.COMPILER }}-${{ env.QT_VER }}-${{ env.VULKAN_SDK_SHA }}-llvm.lock-glslang.lock | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm wondering if the llvm.lock and glslang.lock keys are working? In Azure providing the filename means it will hash the file for the key. However, in https://github.com/actions/cache#creating-a-cache-key I see that they use this function: There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Will check There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let me know what the outcome is here. |
||
restore-keys: ${{ runner.os }}-${{ env.COMPILER }} | ||
|
||
- name: Download and unpack dependencies | ||
shell: bash | ||
run: .ci/setup-windows.sh | ||
|
||
- name: Export Variables | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should should be in a script file. Also, is it possible to do this step in bash? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It can be done in bash, as for making it a file, I'm afraid that There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ahh that's unfortunate, if you could rewrite in bash that'd be great for consistency. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Updated this step to bash |
||
run: | | ||
Get-Content ".ci/ci-vars.env" | ForEach-Object { | ||
# Skip over lines containing comments. | ||
if ($_ -notmatch '^\s*#') | ||
{ | ||
$line = $_ -split '=' | ||
$key = $line[0] | ||
$val = $line[1] | ||
echo "$key=$val" >> $env:GITHUB_ENV | ||
} | ||
} | ||
|
||
- name: Add msbuild to PATH | ||
uses: microsoft/setup-msbuild@main | ||
|
||
- name: Compile RPCS3 | ||
run: msbuild rpcs3.sln /p:Configuration=Release /p:Platform=x64 | ||
|
||
- name: Pack up build artifacts | ||
shell: bash | ||
run: | | ||
mkdir -p build | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should mkdir $BUILD_ARTIFACTSTAGINGDIRECTORY There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should be sorted |
||
.ci/deploy-windows.sh | ||
mkdir -p bin2/${{ env.BUILD_RAW }} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why are we using this bin2 folder instead of just using the existing bin folder for the zip artifact upload. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Bin2 is really only for zipped version artifact to not be double compressed. I'll remove it in favor of 7z There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Zip removed |
||
mv bin/* bin2/${{ env.BUILD_RAW }} | ||
|
||
- name: Upload artifacts (zip) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If I understand correctly, we upload this seperate .zip because the .7z step gets double compressed? Perhaps we only deploy the 7z artifact in the case of a master build for upload. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'll remove zip There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Zip removed |
||
uses: actions/upload-artifact@main | ||
with: | ||
name: RPCS3 for Windows (MSVC) (zip) | ||
path: bin2 | ||
if-no-files-found: error | ||
|
||
- name: Upload artifacts (7z) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same problems with the linux version of this step There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should be sorted |
||
uses: actions/upload-artifact@main | ||
with: | ||
name: RPCS3 for Windows (MSVC) (7z) | ||
# 7z | ||
# 7z.sha256 | ||
path: | | ||
build/${{ env.BUILD }} | ||
build/${{ env.BUILD }}.sha256 | ||
compression-level: 0 | ||
illusion0001 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
if-no-files-found: error |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To save on CI time, we only want to run the clang compiler on arm, since we're already testing both compilers on the x86 build. For arm64 just use the compiler we want to publish binaries with (clang).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be fixed