Skip to content

Commit e718ea8

Browse files
authored
Merge pull request LuxCoreRender#656 from LuxCoreRender/for_v2.10
For v2.10 - Samples Releaser
2 parents cc90021 + ab71333 commit e718ea8

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

.github/workflows/sample-builder.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,15 +294,18 @@ jobs:
294294
apt install -y p7zip-full
295295
296296
- name: Bundle artifacts
297+
working-directory: ${{ github.workspace }}/out/install
298+
shell: bash
297299
run: |
298-
7z a LuxCore.7z ${{ github.workspace }}/out/install/Release
300+
mv Release LuxCore
301+
7z a -snl ../../LuxCoreSamples-${{ runner.os }}-${{ runner.arch }}.zip LuxCore/
299302
300303
# Upload artifacts
301304
- uses: actions/upload-artifact@v4
302305
id: upload
303306
with:
304-
name: LuxCore-${{ runner.os }}-${{ runner.arch }}
305-
path: ${{ github.workspace }}/LuxCore.7z
307+
name: LuxCore-Samples-${{ runner.os }}-${{ runner.arch }}
308+
path: ${{ github.workspace }}/LuxCoreSamples-${{ runner.os }}-${{ runner.arch }}.zip
306309
#path: ${{ github.workspace }}/out/install/Release
307310

308311
attest-samples:

.github/workflows/sample-releaser.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
semver_regex = r"^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$"
4040
res = re.fullmatch(semver_regex, version)
4141
if res:
42-
print("::notice::Version number OK ('{version}')")
42+
print(f"::notice::Version number OK ('{version}')")
4343
else:
4444
message = [
4545
f"::error::INVALID RELEASE VERSION NUMBER '{version}'",
@@ -58,7 +58,6 @@ jobs:
5858
with:
5959
repository: LuxCoreRender/LuxCore
6060
version: ${{ inputs.release-version }}
61-
build-type: Release
6261

6362
create-release:
6463
name: 'Create release'
@@ -77,7 +76,7 @@ jobs:
7776
- uses: actions/checkout@v4
7877
- uses: actions/download-artifact@v4
7978
with:
80-
pattern: cibw-samples-*
79+
pattern: LuxCore-Samples-*
8180
path: ${{ github.workspace }}/dist
8281
merge-multiple: false
8382

0 commit comments

Comments
 (0)