Skip to content

Commit 35d1147

Browse files
committed
release: update scripts
1 parent 1d95f38 commit 35d1147

File tree

14 files changed

+293
-237
lines changed

14 files changed

+293
-237
lines changed

.github/workflows/release.yml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@ jobs:
5151
with:
5252
name: sources
5353
path: '${{ github.workspace}}/dist'
54+
- name: 'Generate summary'
55+
run: |
56+
echo "Run the following commands to download all artifacts:" >> $GITHUB_STEP_SUMMARY
57+
echo '```' >> $GITHUB_STEP_SUMMARY
58+
echo "mkdir -p /tmp/${{ steps.releaser.outputs.project }}-${{ steps.releaser.outputs.version }}" >> $GITHUB_STEP_SUMMARY
59+
echo "cd /tmp/${{ steps.releaser.outputs.project }}-${{ steps.releaser.outputs.version }}" >> $GITHUB_STEP_SUMMARY
60+
echo "gh run -R ${{ github.repository }} download ${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
61+
echo '```' >> $GITHUB_STEP_SUMMARY
5462
5563
linux-verify:
5664
needs: [src]
@@ -104,6 +112,14 @@ jobs:
104112
--root "${{ steps.tar.outputs.path }}" \
105113
--github \
106114
--debug
115+
- name: 'Install Linux dependencies'
116+
run: |
117+
sudo apt-get update -y
118+
sudo apt-get install -y \
119+
gnome-desktop-testing libasound2-dev libpulse-dev libaudio-dev libjack-dev libsndio-dev \
120+
libusb-1.0-0-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev \
121+
libxss-dev libwayland-dev libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
122+
libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev
107123
- name: 'Extract dependencies, build and install them'
108124
id: deps-build
109125
run: |
@@ -678,7 +694,9 @@ jobs:
678694
- name: 'Extract Android SDK from AAR'
679695
id: sdk
680696
run: |
681-
python "${{ github.workspace }}/${{ needs.android.outputs.android-aar }}" -o /tmp/deps-android
697+
unzip -o "${{ github.workspace }}/${{ needs.android.outputs.android-aar }}"
698+
python "${{ needs.src.outputs.project }}-${{ needs.src.outputs.version }}.aar" -o /tmp/SDL3_net-android
699+
echo "prefix=/tmp/SDL3_net-android" >>$GITHUB_OUTPUT
682700
- name: 'Download dependencies'
683701
id: deps
684702
env:
@@ -693,7 +711,9 @@ jobs:
693711
- name: 'Extract dependencies'
694712
id: deps-extract
695713
run: |
696-
python "${{ steps.deps.outputs.dep-path }}/SDL3-${{ steps.deps.outputs.dep-sdl-version }}.aar" -o /tmp/deps-android
714+
unzip -o "${{ steps.deps.outputs.dep-path }}/SDL3-devel-${{ steps.deps.outputs.dep-sdl-version }}-android.zip"
715+
python "SDL3-${{ steps.deps.outputs.dep-sdl-version }}.aar" -o /tmp/SDL3-android
716+
echo "sdl3-prefix=/tmp/SDL3-android" >>$GITHUB_OUTPUT
697717
- name: 'Install ninja'
698718
run: |
699719
sudo apt-get update -y
@@ -707,10 +727,9 @@ jobs:
707727
-GNinja \
708728
-DTEST_FULL=TRUE \
709729
-DTEST_STATIC=FALSE \
710-
-DCMAKE_PREFIX_PATH="/tmp/deps-android" \
730+
-DCMAKE_PREFIX_PATH="${{ steps.sdk.outputs.prefix }};${{ steps.deps-extract.outputs.sdl3-prefix }}" \
711731
-DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
712732
-DANDROID_ABI=${android_abi} \
713-
-Werror=dev \
714733
-DCMAKE_BUILD_TYPE=Release \
715734
-B "${android_abi}"
716735
echo "Building ${android_abi}..."

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.16)
1+
cmake_minimum_required(VERSION 3.16...3.28)
22

33
if(NOT DEFINED CMAKE_BUILD_TYPE)
44
set(cmake_build_type_undefined 1)
@@ -156,7 +156,7 @@ if(NOT ANDROID)
156156
VERSION "${SO_VERSION}"
157157
)
158158
if(APPLE)
159-
cmake_minimum_required(VERSION 3.17)
159+
cmake_minimum_required(VERSION 3.17...3.28)
160160
set_target_properties(${sdl3_net_target_name} PROPERTIES
161161
MACHO_COMPATIBILITY_VERSION "${DYLIB_COMPAT_VERSION}"
162162
MACHO_CURRENT_VERSION "${DYLIB_CURRENT_VERSION}"

VisualC/SDL_net.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,4 +207,4 @@
207207
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
208208
<ImportGroup Label="ExtensionTargets">
209209
</ImportGroup>
210-
</Project>
210+
</Project>

VisualC/pkg-support/cmake/sdl3_net-config-version.cmake

Lines changed: 0 additions & 54 deletions
This file was deleted.

VisualC/pkg-support/cmake/sdl3_net-config.cmake

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)