Skip to content

Commit

Permalink
build: update submodule "pr_steam_networking_sockets"
Browse files Browse the repository at this point in the history
  • Loading branch information
Silverlan committed Jun 18, 2024
1 parent f7767b6 commit c130495
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 38 deletions.
2 changes: 1 addition & 1 deletion build_scripts/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,7 @@ def execbuildscript(filepath):
if with_networking:
add_pragma_module(
name="pr_steam_networking_sockets",
commitSha="e4e512de894acaf100d74edb7e2c0b1c50fbe062",
commitSha="6c924b4eb30588a0c1b5d92f747e7537a7498589",
repositoryUrl="https://github.com/Silverlan/pr_steam_networking_sockets.git",
skipBuildTarget=True
)
Expand Down
43 changes: 6 additions & 37 deletions github_actions/build_generic_module/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ inputs:
token:
description: 'PAT token required to fetch the repository.'
required: true
default: '${{ github.token }}'
default: ''
debug-artifact-token:
description: 'Token required for upload of debug artifacts (e.g. CMakeCache.txt).'
required: true
Expand All @@ -49,45 +49,14 @@ runs:
- name: Setup Pragma
uses: Silverlan/pragma/github_actions/setup@main
with:
with_cuda: ${{ inputs.with-cuda }}

# We need the latest Windows SDK
- name: Install Windows SDK
if: runner.os == 'Windows'
uses: GuillaumeFalourd/[email protected]
with:
sdk-version: 22621

- name: Set Build and CMake Arguments
shell: bash
id: set-cmake-args
run: |
if [ "$RUNNER_OS" == "Linux" ]; then
echo "cmake-args=\"\"" >> $GITHUB_OUTPUT
else
echo "cmake-args=\"-DCMAKE_SYSTEM_VERSION=10.0.22621.0\"" >> $GITHUB_OUTPUT
fi
build_args="${{ inputs.build-args }}"
if [ -z "$build_args" ]; then
build_args="--module ${{ inputs.module }}"
fi
echo "build-args=$build_args" >> $GITHUB_OUTPUT
- name: "Download Module"
uses: actions/checkout@v4
with:
submodules: 'recursive'
path: 'pragma/modules/${{ inputs.module }}'
token: '${{ inputs.token }}'
repository: '${{ inputs.repository }}'
ref: ${{ inputs.ref }}
branch: main
clone_url: "https://github.com/Silverlan/pragma.git"

- name: Build Pragma
id: build-pragma
uses: Silverlan/pragma/github_actions/build@main
id: build-pragma
with:
build-args: '--with-lua-debugger=0 --no-libssl --with-common-modules=0 --with-essential-client-modules=0 --cmake-arg=${{ steps.set-cmake-args.outputs.cmake-args }} ${{ steps.set-cmake-args.outputs.build-args }}'
build-args: "--with-pfm --with-all-pfm-modules --with-vr --with-lua-debugger=0"

- name: Set Output Variables
shell: bash
Expand All @@ -102,7 +71,7 @@ runs:
if: ${{ !cancelled() && inputs.debug-artifact-token != '' }}
uses: Silverlan/pragma/github_actions/upload_debug_artifacts@main
with:
token: ${{ inputs.debug-artifact-token }}
token: ${{ steps.set-token.debug_artifact_token }}
commit: ${{ github.ref_name }}
build-dir: '${{ steps.build-pragma.outputs.build-dir }}'
deps-dir: '${{ steps.build-pragma.outputs.deps-dir }}'
Expand Down

0 comments on commit c130495

Please sign in to comment.