From 0e56999a573fada2cce6e94c21ef856cc88dc933 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Wed, 10 Jul 2024 22:37:21 +0800 Subject: WIP Drop Premake (#3703) * Remove premake lua * Remove premake generated vs project * remove deps file * Remove premake driving bat files * Full test matrix under CMake * Remove premake based ci workflows * Wiggle CI * remove cmake from ci name * find frameworks correctly on osx * remove cmake from ci name * Cope with sccache not being available * cmake based falcor tests * ci wobble * only install ninja if necessary * more appropriate cache name * Remove premake from build instructions * Add some docs on ci setup * remove premake from regression tests * remove premake from perf test * Set SLANGC_PATH * ci wobble * bump slang-binaries * ci wobble * Bump spirv tools * dont use timestamp in cache * remote debug code * cache key wobble * Install sccache after building llvm * Do not build llvm tools * ci wobble * ci wobble * ci wobble * ci wobble * ci wobble * Tests spirv via glsl in ci * Define SLANG_ENABLE_XLIB=1 * osx builds on aarch64 * ci wobble * ci wobble * ci wobble * ci wobble * ci wobble * ci wobble * package documentation and metadata with cmake * ci wobble * Split hlsl double intrinsic tests * ci wobble * Correct type for double log10 Fixes https://github.com/shader-slang/slang/issues/4549 * remove working test from expected failures * add broken test to expected failures * smaller build for falcor tests * ci wobble * A few exclusions in ci * wip, release script * Enable examples in ci * neaten release script * Correct building docs * Only use xlib vulkan when slang_enable_xlib is true * bump slang-llvm version * Remove toolchain file use * Bump slang-llvm preset version * slash direction * Improve build directions * Add msvc cross build documentation * Disable old release files * Smaller set of releases for test * Allow not building llvm * simplify release matrix * Cross releases * formatting * formatting * ci wiggle * ci wiggle * cleaner * neaten * ci wobble * formatting * Install cross tools on linux * do not clean build dir * neaten ci * neaten ci * neaten ci * remove unused release workflow files * Build llvm on some platforms * neaten ci * notarize on osx * s/x64/x86_64 * ci wobble * Embed stdlib for release build * wobble ci * wobble ci * s/x64/x86_64 * ci wobble * ci wobble * ci wobble * vk-gl-cts on cmake * neaten ci * neaten ci * bump cache action version * Cope with windows being weird about case * old glibc version * old glibc version * Correct action file * Keep cache hot on main branch * separate small script for old glibc releases * ci wobble * ci wobble * Run cmake outside of docker * only sign on releases * Revert "Run cmake outside of docker" This reverts commit a58aaba939a4aa35fe70962fd60d9512b143592f. * python3 on build image * less parallel * ci wobble * ci wobble * ci wobble * newer git * ci wobble * ci wobble * Use newer docker image * Use newer docker image * sccache wobble * permissions issue * neaten * build llvm in ci * build llvm in ci * Remove linux clang build in ci * Only install crossbuild tools on non-aarch64 systems * neaten ci.yml * Correct github matrix * Simplify github matrix * ci wobble * Disable broken test See https://github.com/shader-slang/slang/issues/4589 * ci wobble * Neater slang-llvm archive filename * Neater path for uploading artifacts * Neater ci names * Use Windows SDK 10.0.19041.0 in cmake builds --- .github/workflows/release-windows.yml | 116 ---------------------------------- 1 file changed, 116 deletions(-) delete mode 100644 .github/workflows/release-windows.yml (limited to '.github/workflows/release-windows.yml') diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml deleted file mode 100644 index f4cacd873..000000000 --- a/.github/workflows/release-windows.yml +++ /dev/null @@ -1,116 +0,0 @@ -on: - push: - # Sequence of patterns matched against refs/tags - tags: - - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 - -name: Windows Release - -jobs: - build: - name: Upload Release Asset - Windows - runs-on: windows-latest - strategy: - matrix: - configuration: ['Release'] - platform: ['Win32', 'x64', 'aarch64'] - steps: - - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - name: setup-msbuild - uses: microsoft/setup-msbuild@v1 - - - name: msbuild (x64 tools) - # If we are building for ARM64 we want to build x64 first, so that all generated files are produced - if: ${{ matrix.platform == 'aarch64' }} - run: | - .\premake.bat vs2019 --arch=x64 --ignore-deps=slang-llvm,slang-glslang --no-progress=true - MSBuild.exe slang.sln -v:m -m -property:Configuration=Release -property:Platform=x64 -property:WindowsTargetPlatformVersion=10.0.19041.0 - Remove-Item .\bin\* -Recurse -Force - .\premake.bat vs2019 --arch=${{matrix.platform}} --ignore-deps=slang-llvm,slang-glslang --no-progress=true --skip-source-generation=true --deploy-slang-llvm=false --deploy-slang-glslang=false - # Do the premake for the actual target, downloading dependencies if necessary - - name: premake - if: ${{ matrix.platform != 'aarch64' }} - run: - .\premake.bat vs2019 --enable-embed-stdlib=true --arch=${{matrix.platform}} --deps=true --no-progress=true - - name: tag-version - run: .\make-slang-tag-version.bat - - name: msbuild - run: - MSBuild.exe slang.sln -v:m -m -property:Configuration=${{matrix.configuration}} -property:Platform=${{matrix.platform}} -property:WindowsTargetPlatformVersion=10.0.19041.0 - - name: archive - id: archive - run: | - echo "achiving files..." - if ("${{matrix.platform}}" -eq "aarch64") - { - $slangDeployPlatform = "win-arm64" - } - elseif ("${{matrix.platform}}" -eq "x64") - { - $slangDeployPlatform = "win64" - } - else - { - $slangDeployPlatform = "win32" - } - $tagName = & git describe --tags - $slangVersion = $tagName.TrimStart("v") - $binArchive = "slang-$slangVersion-$slangDeployPlatform.zip" - - echo "name=SLANG_BINARY_ARCHIVE::$binArchive" - echo "SLANG_WIN32_BINARY_ARCHIVE=$binArchive" >> $env:GITHUB_OUTPUT - - 7z a "$binArchive" slang.h - 7z a "$binArchive" slang-com-helper.h - 7z a "$binArchive" slang-com-ptr.h - 7z a "$binArchive" slang-tag-version.h - 7z a "$binArchive" slang-gfx.h - 7z a "$binArchive" prelude\*.h - 7z a "$binArchive" bin\*\*\slang.dll - 7z a "$binArchive" bin\*\*\slang.lib - 7z a "$binArchive" bin\*\*\slang-rt.lib - 7z a "$binArchive" bin\*\*\slang-rt.dll - 7z a "$binArchive" bin\*\*\slang-glslang.dll - 7z a "$binArchive" bin\*\*\slang-llvm.dll - 7z a "$binArchive" bin\*\*\gfx.dll - 7z a "$binArchive" bin\*\*\gfx.lib - 7z a "$binArchive" bin\*\*\slangc.exe - 7z a "$binArchive" bin\*\*\slangd.exe - 7z a "$binArchive" docs\*.md - 7z a "$binArchive" README.md - 7z a "$binArchive" LICENSE - - $srcArchive = "slang-$slangVersion-source.zip" - echo "SLANG_SOURCE_ARCHIVE=$srcArchive" >> $env:GITHUB_OUTPUT - - 7z a "$srcArchive" slang.h - 7z a "$srcArchive" slang-com-helper.h - 7z a "$srcArchive" slang-com-ptr.h - 7z a "$srcArchive" slang-tag-version.h - 7z a "$srcArchive" slang-gfx.h - 7z a "$srcArchive" prelude\*.h - 7z a "$srcArchive" source\*\*.h - 7z a "$srcArchive" source\*\*.cpp - 7z a "$srcArchive" docs\*.md - 7z a "$srcArchive" README.md - 7z a "$srcArchive" LICENSE - - name: Check outputs - shell: pwsh - run: echo "binary is ${{ steps.archive.outputs.SLANG_WIN32_BINARY_ARCHIVE }}" - - name: UploadBinary - uses: softprops/action-gh-release@v1 - with: - files: | - ${{ steps.archive.outputs.SLANG_WIN32_BINARY_ARCHIVE }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: UploadSource - uses: softprops/action-gh-release@v1 - if: ${{ matrix.platform == 'x64' }} - with: - files: ${{ steps.archive.outputs.SLANG_SOURCE_ARCHIVE }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -- cgit v1.2.3