diff --git a/.github/workflows/falcor-test.yml b/.github/workflows/falcor-test.yml deleted file mode 100644 index e96a24f655..0000000000 --- a/.github/workflows/falcor-test.yml +++ /dev/null @@ -1,65 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Falcor Tests - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - runs-on: [Windows, self-hosted] - timeout-minutes: 100 - continue-on-error: true - strategy: - fail-fast: false - matrix: - configuration: ['Release'] - platform: ['x64'] - include: - - platform: x64 - testPlatform: x64 - - platform: x64 - testCategory: full - steps: - - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - name: setup-msbuild - uses: microsoft/setup-msbuild@v1 - - name: setup-falcor - run: | - mkdir FalcorBin - cd FalcorBin - Copy-Item -Path 'C:\Falcor\build\windows-vs2022\bin' -Destination '.\build\windows-vs2022\bin' -Recurse -Exclude ("*.pdb") - Copy-Item -Path 'C:\Falcor\tests' -Destination '.\' -Recurse - Copy-Item -Path 'C:\Falcor\tools' -Destination '.\' -Recurse - Copy-Item -Path 'C:\Falcor\media' -Destination '.\' -Recurse - Copy-Item -Path 'C:\Falcor\media_internal' -Destination '.\' -Recurse - Copy-Item -Path 'C:\Falcor\scripts' -Destination '.\' -Recurse - cd ..\ - - name: build - run: | - .\premake.bat vs2019 --arch=${{matrix.platform}} --deps=true --no-progress=true --enable-cuda=true - - .\make-slang-tag-version.bat - - MSBuild.exe slang.sln -v:m -m -property:Configuration=${{matrix.configuration}} -property:Platform=${{matrix.platform}} -property:WindowsTargetPlatformVersion=10.0.19041.0 -maxcpucount:12 - - Copy-Item -Path '.\bin\windows-${{matrix.platform}}\${{matrix.configuration}}\*' -Destination '.\FalcorBin\build\windows-vs2022\bin\Release\' -Recurse -Exclude ("*.pdb") - - name: falcor-unit-test - run: | - $ErrorActionPreference = "SilentlyContinue" - cd .\FalcorBin\tests - python ./testing/run_unit_tests.py --config windows-vs2022-Release -t "-slow" - cd ../../ - - name: falcor-image-test - run: | - $ErrorActionPreference = "SilentlyContinue" - cd .\FalcorBin\tests - python ./testing/run_image_tests.py --config windows-vs2022-Release --run-only - cd ../../ - diff --git a/.github/workflows/linux-arm64.yml b/.github/workflows/linux-arm64.yml deleted file mode 100644 index bc1991444c..0000000000 --- a/.github/workflows/linux-arm64.yml +++ /dev/null @@ -1,57 +0,0 @@ -name: Linux/ARM64 Build and Test - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - - runs-on: ['self-hosted', 'Linux', 'ARM64'] - strategy: - matrix: - configuration: ['release'] - compiler: ['gcc'] - platform: ['aarch64'] - steps: - - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - name: build - run: | - CC=${{matrix.compiler}} - CONFIGURATION=${{matrix.configuration}} - ARCH=${{matrix.platform}} - TARGETARCH=${{matrix.platform}} - if [[ "$CC" == "clang" ]]; then - CFLAGS=-Werror - CPPFLAGS=-Werror - CXXFLAGS=-Werror - fi - source ./github_build.sh - - uses: actions/upload-artifact@v3 - with: - name: slang-build-${{matrix.configuration}}-${{matrix.platform}}-${{matrix.compiler}} - path: | - slang.h - slang-com-helper.h - slang-com-ptr.h - slang-tag-version.h - slang-gfx.h - prelude/*.h - bin/**/*.dll - bin/**/*.exe - bin/**/*.so - bin/**/slangc - bin/**/slangd - docs/*.md - - name: test - run: - CONFIGURATION=${{matrix.configuration}} - CC=${{matrix.compiler}} - ARCH=${{matrix.platform}} - PATH="${PATH:+${PATH}:}$(pwd)/external/slang-binaries/spirv-tools/$(uname -m)-linux/bin" - source ./github_test.sh diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml deleted file mode 100644 index 435346837b..0000000000 --- a/.github/workflows/linux.yml +++ /dev/null @@ -1,73 +0,0 @@ -name: Linux Build CI - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - - runs-on: ubuntu-20.04 - strategy: - matrix: - configuration: ['debug', 'release'] - compiler: ['gcc', 'clang'] - platform: ['x64'] - steps: - - name: select gcc 10 - run: | - sudo update-alternatives \ - --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \ - --slave /usr/bin/g++ g++ /usr/bin/g++-10 \ - --slave /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar-10 \ - --slave /usr/bin/gcc-nm gcc-nm /usr/bin/gcc-nm-10 \ - --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-10 \ - --slave /usr/bin/gcov gcov /usr/bin/gcov-10 \ - --slave /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-10 \ - --slave /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-10 - - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - uses: robinraju/release-downloader@v1.7 - with: - latest: true - repository: "shader-slang/swiftshader" - fileName: "vk_swiftshader_linux_${{matrix.platform}}.zip" - - name: build - run: | - CC=${{matrix.compiler}} - CONFIGURATION=${{matrix.configuration}} - ARCH=${{matrix.platform}} - TARGETARCH=${{matrix.platform}} - if [[ "$CC" == "clang" ]]; then - CFLAGS=-Werror - CPPFLAGS=-Werror - CXXFLAGS=-Werror - fi - source ./github_build.sh - - uses: actions/upload-artifact@v3 - with: - name: slang-build-${{matrix.configuration}}-${{matrix.platform}}-${{matrix.compiler}} - path: | - slang.h - slang-com-helper.h - slang-com-ptr.h - slang-tag-version.h - slang-gfx.h - prelude/*.h - bin/**/*.dll - bin/**/*.exe - bin/**/*.so - bin/**/slangc - bin/**/slangd - docs/*.md - - name: test - run: - CONFIGURATION=${{matrix.configuration}} - CC=${{matrix.compiler}} - ARCH=${{matrix.platform}} - PATH="${PATH:+${PATH}:}$(pwd)/external/slang-binaries/spirv-tools/$(uname -m)-linux/bin" - source ./github_test.sh diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml deleted file mode 100644 index eada308c99..0000000000 --- a/.github/workflows/macos.yml +++ /dev/null @@ -1,67 +0,0 @@ -name: MacOS Build CI - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - name: MacOS Build CI - runs-on: macos-latest - - strategy: - matrix: - configuration: ['release'] # 'debug' - compiler: ['clang'] - platform: ['x64'] - targetPlatform: ['x64'] - steps: - - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - name: build - run: | - CC=${{matrix.compiler}} - CONFIGURATION=${{matrix.configuration}} - ARCH=${{matrix.platform}} - TARGETARCH=${{matrix.targetPlatform}} - CPPFLAGS=-Werror - CFLAGS=-Werror - CXXFLAGS=-Werror - source ./github_macos_build.sh - - name: Package - id: package - run: | - export SLANG_OS_NAME=macos - export SLANG_ARCH_NAME=${{matrix.targetPlatform}} - export TAG_NAME=`git describe --tags` - export SLANG_TAG=${TAG_NAME#v} - echo "tag:$TAG_NAME" - echo "slang-tag:$SLANG_TAG" - export SLANG_BINARY_ARCHIVE=slang-${SLANG_TAG}-${SLANG_OS_NAME}-${SLANG_ARCH_NAME}.zip - echo "creating zip" - 7z a ${SLANG_BINARY_ARCHIVE} slang.h - 7z a ${SLANG_BINARY_ARCHIVE} slang-com-helper.h - 7z a ${SLANG_BINARY_ARCHIVE} slang-com-ptr.h - 7z a ${SLANG_BINARY_ARCHIVE} slang-tag-version.h - 7z a ${SLANG_BINARY_ARCHIVE} prelude/*.h - 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/libslang.dylib - 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/slangc - 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/slangd - 7z a ${SLANG_BINARY_ARCHIVE} docs/*.md - echo "SLANG_BINARY_ARCHIVE=${SLANG_BINARY_ARCHIVE}" >> $GITHUB_OUTPUT - - uses: actions/upload-artifact@v3 - with: - name: slang-build-${{matrix.configuration}}-${{matrix.targetPlatform}}-${{matrix.compiler}} - path: | - ${{ steps.package.outputs.SLANG_BINARY_ARCHIVE }} - - name: test - if: ${{ matrix.targetPlatform != 'aarch64' }} - run: - CONFIGURATION=${{matrix.configuration}} - CC=${{matrix.compiler}} - ARCH=${{matrix.targetPlatform}} - source ./github_test.sh diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml deleted file mode 100644 index 3c7d1c75e2..0000000000 --- a/.github/workflows/release-linux.yml +++ /dev/null @@ -1,68 +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: Linux Release - -jobs: - build: - name: Upload Release Asset - runs-on: ubuntu-20.04 - strategy: - matrix: - configuration: ['release'] - compiler: ['gcc'] - platform: ['x64'] - targetPlatform: ['x64'] - steps: - - name: select gcc 10 - run: | - sudo update-alternatives \ - --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \ - --slave /usr/bin/g++ g++ /usr/bin/g++-10 \ - --slave /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar-10 \ - --slave /usr/bin/gcc-nm gcc-nm /usr/bin/gcc-nm-10 \ - --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-10 \ - --slave /usr/bin/gcov gcov /usr/bin/gcov-10 \ - --slave /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-10 \ - --slave /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-10 - - name: Checkout code - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - name: Build release project - id: build - run: | - echo "starting to build..." - export CC=${{matrix.compiler}} - export CONFIGURATION=${{matrix.configuration}} - export ARCH=${{matrix.platform}} - export TARGETARCH=${{matrix.targetPlatform}} - echo "building..." - source ./github_build.sh - echo "creating binary archieves..." - export SLANG_OS_NAME=linux - export SLANG_ARCH_NAME=`uname -p` - export TAG_NAME=`git describe --tags` - export SLANG_TAG=${TAG_NAME#v} - echo "tag:$TAG_NAME" - echo "slang-tag:$SLANG_TAG" - export SLANG_BINARY_ARCHIVE=slang-${SLANG_TAG}-${SLANG_OS_NAME}-${SLANG_ARCH_NAME}.zip - export SLANG_BINARY_ARCHIVE_TAR=slang-${SLANG_TAG}-${SLANG_OS_NAME}-${SLANG_ARCH_NAME}.tar.gz - echo "creating zip" - zip -r ${SLANG_BINARY_ARCHIVE} bin/*/*/slangc bin/*/*/slangd bin/*/*/libslang.so bin/*/*/libslang-glslang.so bin/*/*/libgfx.so bin/*/*/libslang-llvm.so docs/*.md README.md LICENSE slang.h slang-com-helper.h slang-com-ptr.h slang-tag-version.h slang-gfx.h prelude/*.h - echo "creating tar" - tar -czf ${SLANG_BINARY_ARCHIVE_TAR} bin/*/*/slangc bin/*/*/slangd bin/*/*/libslang.so bin/*/*/libslang-glslang.so bin/*/*/libgfx.so bin/*/*/libslang-llvm.so docs/*.md README.md LICENSE slang.h slang-com-helper.h slang-com-ptr.h slang-tag-version.h slang-gfx.h prelude/*.h - echo "SLANG_BINARY_ARCHIVE=${SLANG_BINARY_ARCHIVE}" >> $GITHUB_OUTPUT - echo "SLANG_BINARY_ARCHIVE_TAR=${SLANG_BINARY_ARCHIVE_TAR}" >> $GITHUB_OUTPUT - - name: UploadBinary - uses: softprops/action-gh-release@v1 - with: - files: | - ${{ steps.build.outputs.SLANG_BINARY_ARCHIVE }} - ${{ steps.build.outputs.SLANG_BINARY_ARCHIVE_TAR }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml deleted file mode 100644 index f0e8dab1b5..0000000000 --- a/.github/workflows/release-macos.yml +++ /dev/null @@ -1,121 +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: MacOS Release - -jobs: - build_with_signing: - name: Upload Release Asset - runs-on: macos-latest - strategy: - matrix: - configuration: ['release'] # 'debug' - compiler: ['clang'] - platform: ['x64'] - targetPlatform: ['x64', 'aarch64'] - steps: - - name: Checkout code - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - name: Build release project - id: build - run: | - echo "starting to build..." - export CC=${{matrix.compiler}} - export CONFIGURATION=${{matrix.configuration}} - export ARCH=${{matrix.platform}} - export TARGETARCH=${{matrix.targetPlatform}} - echo "building..." - source ./github_macos_build.sh - - name: "Import signing certificate" - env: - BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }} - P12_PASSWORD: ${{ secrets.P12_PASSWORD }} - KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} - run: | - # create variables - CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12 - KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db - - # import certificate and provisioning profile from secrets - echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH - - # create temporary keychain - security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH - security set-keychain-settings -lut 21600 $KEYCHAIN_PATH - security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH - - # import certificate to keychain - security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH - security list-keychain -d user -s $KEYCHAIN_PATH - - security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k ${KEYCHAIN_PASSWORD} $KEYCHAIN_PATH - - - name: Install nortarize tools - run: | - brew install Bearer/tap/gon - security find-identity -v - brew install coreutils - - name: Sign binaries - env: - IDENTITY_ID: d6ada82a113e4204aaad914e1013e9548ffd30d0 - run: | - /usr/bin/codesign --force --options runtime -s ${IDENTITY_ID} ./bin/macosx-${{matrix.targetPlatform}}/release/libslang.dylib -v - /usr/bin/codesign --force --options runtime -s ${IDENTITY_ID} ./bin/macosx-${{matrix.targetPlatform}}/release/slangd -v - /usr/bin/codesign --force --options runtime -s ${IDENTITY_ID} ./bin/macosx-${{matrix.targetPlatform}}/release/slangc -v - - name: Package - id: package - run: | - export SLANG_OS_NAME=macos - export SLANG_ARCH_NAME=${{matrix.targetPlatform}} - export TAG_NAME=`git describe --tags` - export SLANG_TAG=${TAG_NAME#v} - echo "tag:$TAG_NAME" - echo "slang-tag:$SLANG_TAG" - export SLANG_BINARY_ARCHIVE=slang-${SLANG_TAG}-${SLANG_OS_NAME}-${SLANG_ARCH_NAME}.zip - echo "creating zip" - 7z a ${SLANG_BINARY_ARCHIVE} slang.h - 7z a ${SLANG_BINARY_ARCHIVE} slang-com-helper.h - 7z a ${SLANG_BINARY_ARCHIVE} slang-com-ptr.h - 7z a ${SLANG_BINARY_ARCHIVE} slang-tag-version.h - 7z a ${SLANG_BINARY_ARCHIVE} prelude/*.h - 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/libslang.dylib - 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/slangc - 7z a ${SLANG_BINARY_ARCHIVE} bin/*/*/slangd - 7z a ${SLANG_BINARY_ARCHIVE} docs/*.md - echo "SLANG_BINARY_ARCHIVE=${SLANG_BINARY_ARCHIVE}" >> $GITHUB_OUTPUT - - name: UploadBinary - uses: softprops/action-gh-release@v1 - with: - files: | - ${{ steps.package.outputs.SLANG_BINARY_ARCHIVE }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Notarize - env: - AC_PASSWORD: ${{secrets.APPLE_ID_PASSWORD}} - AC_PROVIDER: ${{secrets.APPLE_ID_PPOVIDER}} - AC_USERNAME: ${{secrets.APPLE_ID_USERNAME}} - run: | - cp ./bin/macosx-${{matrix.targetPlatform}}/release/libslang.dylib libslang.dylib - cp ./bin/macosx-${{matrix.targetPlatform}}/release/slangd slangd - cp ./bin/macosx-${{matrix.targetPlatform}}/release/slangc slangc - 7z a slang-macos-dist.zip libslang.dylib - 7z a slang-macos-dist.zip slangd - 7z a slang-macos-dist.zip slangc - cp slang-macos-dist.zip slang-macos-dist-${{matrix.targetPlatform}}.zip - timeout 1000 gon ./extras/macos-notarize.json - - name: UploadNotarizedBinary - if: always() - uses: softprops/action-gh-release@v1 - with: - files: | - slang-macos-dist-${{matrix.targetPlatform}}.zip - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml deleted file mode 100644 index e26339ca6f..0000000000 --- a/.github/workflows/release-windows.yml +++ /dev/null @@ -1,114 +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 - - $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 }} \ No newline at end of file diff --git a/.github/workflows/verify-solution-file.yml b/.github/workflows/verify-solution-file.yml deleted file mode 100644 index df4503dadd..0000000000 --- a/.github/workflows/verify-solution-file.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Verify-VSProjects - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - runs-on: windows-latest - steps: - - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '1' - - name: verify - run: | - & .\premake.bat vs2019 --deps=true - $diff = & git diff - if ($diff.length -ne 0) - { - $diff - throw "error: vs project file verification failed." - } diff --git a/.github/workflows/windows-selfhosted.yml b/.github/workflows/windows-selfhosted.yml deleted file mode 100644 index f726db8b6c..0000000000 --- a/.github/workflows/windows-selfhosted.yml +++ /dev/null @@ -1,52 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Full GPU Tests (Windows) - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - runs-on: [Windows, self-hosted] - timeout-minutes: 100 - continue-on-error: true - strategy: - fail-fast: false - matrix: - configuration: ['Release'] - platform: ['x64'] - include: - - platform: x64 - testPlatform: x64 - - platform: x64 - testCategory: full - steps: - - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - name: setup-msbuild - uses: microsoft/setup-msbuild@v1 - - name: build - run: | - .\premake.bat vs2019 --arch=${{matrix.platform}} --deps=true --no-progress=true --enable-cuda=true - - .\make-slang-tag-version.bat - - MSBuild.exe slang.sln -v:m -m -property:Configuration=${{matrix.configuration}} -property:Platform=${{matrix.platform}} -property:WindowsTargetPlatformVersion=10.0.19041.0 -maxcpucount:12 - - name: test-spirv-direct - run: | - $ErrorActionPreference = "SilentlyContinue" - where.exe spirv-dis - spirv-dis --version - $env:SLANG_RUN_SPIRV_VALIDATION='1' - .\bin\windows-${{matrix.testPlatform}}\${{matrix.configuration}}\slang-test.exe tests/ -use-test-server -server-count 8 -emit-spirv-directly -expected-failure-list tests/expected-failure.txt -api vk 2>&1 - - - name: test - run: | - $ErrorActionPreference = "SilentlyContinue" - .\bin\windows-${{matrix.testPlatform}}\${{matrix.configuration}}\slang-test.exe -use-test-server -server-count 8 -api all-cpu - diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml deleted file mode 100644 index 9f48ccd0a1..0000000000 --- a/.github/workflows/windows.yml +++ /dev/null @@ -1,71 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Windows Build CI - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - runs-on: windows-latest - strategy: - matrix: - configuration: ['Debug', 'Release'] - platform: ['Win32', 'x64'] - include: - - platform: Win32 - testPlatform: x86 - - platform: x64 - testPlatform: x64 - - testCategory: quick - - platform: x64 - testCategory: full - - configuration: Debug - testCategory: smoke - steps: - - uses: actions/checkout@v3 - with: - submodules: 'true' - fetch-depth: '0' - - uses: robinraju/release-downloader@v1.7 - with: - latest: true - repository: "shader-slang/swiftshader" - fileName: "vk_swiftshader_windows_${{matrix.testPlatform}}.zip" - - name: setup-msbuild - uses: microsoft/setup-msbuild@v1 - - name: build - run: | - .\premake.bat vs2019 --enable-embed-stdlib=true --arch=${{matrix.platform}} --deps=true --no-progress=true - - .\make-slang-tag-version.bat - - MSBuild.exe slang.sln -v:m -m -property:Configuration=${{matrix.configuration}} -property:Platform=${{matrix.platform}} -property:WindowsTargetPlatformVersion=10.0.19041.0 -warnAsError - - uses: actions/upload-artifact@v3 - with: - name: slang-build-${{matrix.configuration}}-${{matrix.platform}}-${{matrix.compiler}} - path: | - slang.h - slang-com-helper.h - slang-com-ptr.h - slang-tag-version.h - slang-gfx.h - prelude/*.h - bin/**/*.dll - bin/**/*.exe - bin/**/*.so - bin/**/slangc - bin/**/slangd - docs/*.md - - name: test - run: | - $slangTestBinDir = ".\bin\windows-${{matrix.testPlatform}}\${{matrix.configuration}}\"; - $spirvToolsBinDir = ".\external\slang-binaries\spirv-tools\windows-${{matrix.testPlatform}}\bin\"; - $env:Path += ";$slangTestBinDir;$spirvToolsBinDir"; - $env:SLANG_RUN_SPIRV_VALIDATION='1'; - Expand-Archive "vk_swiftshader_windows_${{matrix.testPlatform}}.zip" -DestinationPath $slangTestBinDir; - & "$slangTestBinDir\slang-test.exe" -api all-dx12 -appveyor -bindir "$slangTestBinDir\" -platform ${{matrix.testPlatform}} -configuration ${{matrix.configuration}} -category ${{matrix.testCategory}} -expected-failure-list tests/expected-failure-github.txt 2>&1; -