Skip to content

Commit

Permalink
Merge pull request #73 from Silverlan/develop
Browse files Browse the repository at this point in the history
revert(build_generic_module): revert changes from c130495
  • Loading branch information
Silverlan authored Jun 18, 2024
2 parents c1e4545 + 88a979d commit 5a14a67
Showing 1 changed file with 36 additions and 5 deletions.
41 changes: 36 additions & 5 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: ''
default: '${{ github.token }}'
debug-artifact-token:
description: 'Token required for upload of debug artifacts (e.g. CMakeCache.txt).'
required: true
Expand All @@ -49,12 +49,43 @@ runs:
- name: Setup Pragma
uses: Silverlan/pragma/github_actions/setup@main
with:
branch: main
clone_url: "https://github.com/Silverlan/pragma.git"
with_cuda: ${{ inputs.with-cuda }}

# We need the latest Windows SDK
- name: Install Windows SDK
if: runner.os == 'Windows'
uses: GuillaumeFalourd/setup-windows10-sdk-action@v1.11
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 }}

- name: Build Pragma
uses: Silverlan/pragma/github_actions/build@main
id: build-pragma
uses: Silverlan/pragma/github_actions/build@main
with:
build-args: '--with-lua-debugger=0 --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 }}'

Expand All @@ -71,7 +102,7 @@ runs:
if: ${{ !cancelled() && inputs.debug-artifact-token != '' }}
uses: Silverlan/pragma/github_actions/upload_debug_artifacts@main
with:
token: ${{ steps.set-token.debug_artifact_token }}
token: ${{ inputs.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 5a14a67

Please sign in to comment.