Skip to content
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.

Sign up for GitHub

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

Drop the architecture name off the binary name #47

Merged
merged 1 commit into from
Dec 11, 2022
Merged

Drop the architecture name off the binary name #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 11 additions & 17 deletions .github/workflows/rp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ jobs:
if: matrix.generator == 'ninja'
uses: actions/upload-artifact@v2
with:
name: rp-win-x64.RelWithDebInfo
name: rp-win
path: |
src/build/rp-win-x64.exe
src/build/rp-win-x64.pdb
src/build/rp-win.exe
src/build/rp-win.pdb

Linux:
runs-on: ubuntu-latest
Expand All @@ -62,14 +62,14 @@ jobs:
- name: Installing dependencies
run: |
sudo apt-get -y update
sudo apt install -y g++-10 ninja-build
sudo apt install -y g++-12 ninja-build
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"

- name: Build with gcc
if: matrix.compiler == 'gcc'
env:
CC: gcc-10
CXX: g++-10
CC: gcc-12
CXX: g++-12
run: |
cd src/build
chmod u+x ./build-release.sh
Expand All @@ -88,24 +88,18 @@ jobs:
- name: Upload artifacts
uses: actions/upload-artifact@v2
with:
name: rp-lin-x64-${{ matrix.compiler }}.Release
name: rp-lin-${{ matrix.compiler }}
path: |
src/build/rp-lin-x64
src/build/rp-lin

OSX:
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
compiler: ['clang']

name: OSX Latest / ${{ matrix.compiler }}
name: OSX Latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Build with clang
if: matrix.compiler == 'clang'
env:
CC: clang
CXX: clang++
Expand All @@ -117,6 +111,6 @@ jobs:
- name: Upload artifacts
uses: actions/upload-artifact@v2
with:
name: rp-osx-x64-${{ matrix.compiler }}.Release
name: rp-osx
path: |
src/build/rp-osx-x64
src/build/rp-osx
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ elseif(UNIX)
endif()
endif()

set(RP_PLAT "rp-${RP_PLAT}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
set(RP_PLAT "rp-${RP_PLAT}")

file(
GLOB
Expand Down