Skip to content

Commit 67c257b

Browse files
committed
Github workflows : Publish Windows artifacts and releases
1 parent f6dbb44 commit 67c257b

File tree

2 files changed

+21
-6
lines changed

2 files changed

+21
-6
lines changed

.github/workflows/main.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
options: .github/workflows/main/options.windows
7373
dependenciesURL: https://github.com/hypothetical-inc/gafferDependencies/releases/download/6.1.0/gafferDependencies-6.1.0-Python3-windows.zip
7474
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
75-
publish: false
75+
publish: true
7676

7777
- name: windows-python3-debug
7878
os: windows-2019
@@ -95,7 +95,10 @@ jobs:
9595
sdk: 10.0.17763.0
9696

9797
- name: Install toolchain (Windows)
98-
run: python -m pip install scons
98+
run: |
99+
python -m pip install scons
100+
echo "PACKAGE_COMMAND=7z a -tzip" >> $env:GITHUB_ENV
101+
echo "PACKAGE_EXTENSION=zip" >> $env:GITHUB_ENV
99102
if: runner.os == 'Windows'
100103

101104
- name: Install toolchain (MacOS)
@@ -109,6 +112,8 @@ jobs:
109112
# _before_ anything we specify with `-isystem`, despite documentation to the
110113
# contrary. So we nuke the headers.
111114
rm -rf /usr/local/include/*
115+
echo PACKAGE_COMMAND=tar -czf >> $GITHUB_ENV
116+
echo PACKAGE_EXTENSION=tar.gz >> $GITHUB_ENV
112117
if: runner.os == 'macOS'
113118

114119
- name: Install toolchain (Linux)
@@ -123,6 +128,8 @@ jobs:
123128
# in later steps.
124129
echo $PATH > $GITHUB_PATH
125130
echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH >> $GITHUB_ENV
131+
echo PACKAGE_COMMAND=tar -czf >> $GITHUB_ENV
132+
echo PACKAGE_EXTENSION=tar.gz >> $GITHUB_ENV
126133
shell: bash
127134
if: runner.os == 'Linux'
128135

@@ -177,19 +184,19 @@ jobs:
177184

178185
- name: Build Package
179186
run: |
180-
tar -czf ${{ env.CORTEX_BUILD_NAME }}.tar.gz ${{ env.CORTEX_BUILD_NAME }}
187+
${{ env.PACKAGE_COMMAND }} ${{ env.CORTEX_BUILD_NAME }}.${{env.PACKAGE_EXTENSION}} ${{ env.CORTEX_BUILD_NAME }}
181188
if: matrix.publish
182189

183190
- uses: actions/upload-artifact@v2
184191
with:
185192
name: ${{ env.CORTEX_BUILD_NAME }}
186-
path: ${{ env.CORTEX_BUILD_NAME }}.tar.gz
193+
path: ${{ env.CORTEX_BUILD_NAME }}.${{ env.PACKAGE_EXTENSION }}
187194
if: matrix.publish
188195

189196
- name: Publish Release
190197
run: |
191-
./.github/workflows/main/publishRelease.py --archive ${{ env.CORTEX_BUILD_NAME }}.tar.gz --repo ${{ github.repository }} --releaseId ${{ env.CORTEX_GITHUB_RELEASEID }}
192-
if: matrix.publish && env.CORTEX_GITHUB_RELEASEID != '' && runner.os != 'Windows'
198+
python ./.github/workflows/main/publishRelease.py --archive ${{ env.CORTEX_BUILD_NAME }}.${{ env.PACKAGE_EXTENSION }} --repo ${{ github.repository }} --releaseId ${{ env.CORTEX_GITHUB_RELEASEID }}
199+
if: matrix.publish && env.CORTEX_GITHUB_RELEASEID != ''
193200

194201
env:
195202
GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Changes

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
10.4.x.x (relative to 10.4.2.0)
2+
========
3+
4+
Build
5+
-----
6+
7+
- Added Windows package to build artifacts and release binaries.
8+
19
10.4.2.0 (relative to 10.4.1.2)
210
========
311

0 commit comments

Comments
 (0)