diff options
| author | Ellie Hermaszewska <ellieh@nvidia.com> | 2024-07-11 00:00:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-11 00:00:59 +0800 |
| commit | 5c9ce374e63e5d050da5349f89dc60be0c47f1ac (patch) | |
| tree | 8d7e64fc93ce7fcea141d2ff9c5bd478225b7337 | |
| parent | 0e56999a573fada2cce6e94c21ef856cc88dc933 (diff) | |
A couple of small fixes to cmake releases (#4596)
* Correct windows file uploading
* Include slang-llvm.so in releases
* Neaten job names
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 6 | ||||
| -rw-r--r-- | CMakePresets.json | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b23308ab3..88ce31828 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,18 +44,18 @@ jobs: - full-gpu-tests: false # Self-hosted aarch64 build - os: linux + config: release compiler: gcc platform: aarch64 - config: release warnings-as-errors: false test-category: smoke full-gpu-tests: false runs-on: [self-hosted, Linux, ARM64] # Self-hosted full gpu build - os: windows + config: release compiler: cl platform: x86_64 - config: release warnings-as-errors: false test-category: full full-gpu-tests: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2fefe5bd9..5548c77b8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -154,10 +154,10 @@ jobs: cpack --preset "$config" -G ZIP cpack --preset "$config" -G TGZ triggering_ref=${{ github.ref_name }} - base=$(pwd)/slang-${triggering_ref#v}-${{matrix.os}}-${{matrix.platform}} - mv "$(pwd)/build/dist-${config}/slang.zip" "${base}.zip" + base=slang-${triggering_ref#v}-${{matrix.os}}-${{matrix.platform}} + mv --verbose "$(pwd)/build/dist-${config}/slang.zip" "${base}.zip" echo "SLANG_BINARY_ARCHIVE_ZIP=${base}.zip" >> $GITHUB_OUTPUT - mv "$(pwd)/build/dist-${config}/slang.tar.gz" "${base}.tar.gz" + mv --verbose "$(pwd)/build/dist-${config}/slang.tar.gz" "${base}.tar.gz" echo "SLANG_BINARY_ARCHIVE_TAR=${base}.tar.gz" >> $GITHUB_OUTPUT - name: File check diff --git a/CMakePresets.json b/CMakePresets.json index 36543c1c8..7e0697afb 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -81,7 +81,7 @@ ], "variables": { "CPACK_PACKAGE_FILE_NAME": "slang", - "CPACK_COMPONENTS_ALL": "Unspecified;metadata" + "CPACK_COMPONENTS_ALL": "Unspecified;metadata;slang-llvm" } }, { |