Skip to content

Commit 1540876

Browse files
[GH Action] Upgraded Windows runner and enabled Ubuntu ARM64 builds (#33)
Updated from Windows 2019 to Windows 2025. This also made it necessary to upgrade Visual Studio to 2019 (from 2017)
1 parent 352e711 commit 1540876

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

.github/workflows/build-ubuntu.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
library_type: [static, shared, object]
20-
os: [ubuntu-24.04, ubuntu-22.04]
20+
os: [ubuntu-24.04, ubuntu-22.04, ubuntu-24.04-arm, ubuntu-22.04-arm]
2121

2222
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
2323
# You can convert this to a matrix build if you need cross-platform coverage.
@@ -41,6 +41,13 @@ jobs:
4141
echo "tcp_pubsub_library_type=OBJECT" >> "$GITHUB_ENV"
4242
echo "package_postfix=object" >> "$GITHUB_ENV"
4343
fi
44+
45+
# Get the ubuntu version
46+
os_version=$(lsb_release -r | awk '{print $2}')
47+
echo "os_name=ubuntu-${os_version}" >> "$GITHUB_ENV"
48+
49+
# Get cpu architecture for the package name (therefore the dpkg architecture, which differs from the arch architecture)
50+
echo "cpu_architecture=$(dpkg --print-architecture)" >> "$GITHUB_ENV"
4451
4552
- name: Checkout
4653
uses: actions/checkout@v4
@@ -90,15 +97,15 @@ jobs:
9097

9198
- name: Rename .deb installer
9299
run: |
93-
mv *.deb '${{ env.PROJECT_NAME }}-${{ env.CMAKE_PROJECT_VERSION }}-${{ matrix.os }}-${{ env.package_postfix }}.deb'
100+
mv *.deb '${{ env.PROJECT_NAME }}-${{ env.CMAKE_PROJECT_VERSION }}-${{ env.os_name }}_${{ env.cpu_architecture }}-${{ env.package_postfix }}.deb'
94101
shell: bash
95102
working-directory: ${{github.workspace}}/_build/_package/
96103
if: ${{ matrix.library_type != 'object' }}
97104

98105
- name: Upload binaries
99106
uses: actions/upload-artifact@v4
100107
with:
101-
name: ${{ env.PROJECT_NAME }}-${{ env.CMAKE_PROJECT_VERSION }}-${{ matrix.os }}-${{ env.package_postfix }}
108+
name: ${{ env.PROJECT_NAME }}-${{ env.CMAKE_PROJECT_VERSION }}-${{ env.os_name }}_${{ env.cpu_architecture }}-${{ env.package_postfix }}
102109
path: ${{github.workspace}}/_build/_package/*.deb
103110
if: ${{ matrix.library_type != 'object' }}
104111

.github/workflows/build-windows.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ env:
99
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
1010
INSTALL_PREFIX: _install
1111
PROJECT_NAME: tcp_pubsub
12-
VS_TOOLSET: v141
13-
VS_NAME: vs2017
12+
VS_TOOLSET: v142
13+
VS_NAME: vs2019
1414

1515
jobs:
1616
build-windows:
@@ -24,7 +24,7 @@ jobs:
2424
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
2525
# You can convert this to a matrix build if you need cross-platform coverage.
2626
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
27-
runs-on: windows-2019
27+
runs-on: windows-2025
2828

2929
steps:
3030

@@ -62,7 +62,6 @@ jobs:
6262
shell: cmd
6363
run: |
6464
cmake -B ${{github.workspace}}/_build ^
65-
-G "Visual Studio 16 2019" ^
6665
-A ${{ matrix.build_arch }} ^
6766
-T ${{ env.VS_TOOLSET }} ^
6867
-DTCP_PUBSUB_BUILD_SAMPLES=ON ^

0 commit comments

Comments
 (0)