diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8567c933..0b3cb99b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,35 +9,55 @@ jobs: win64: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build shell: pwsh run: | cmake -B build cmake --build build --config Release --target glslcc - name: Upload - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ./build/src/Release/glslcc.exe name: glslcc-win64 linux: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: build shell: pwsh run: | cmake -B build -DCMAKE_BUILD_TYPE=Release cmake --build build --config Release --target glslcc - name: Upload - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ./build/src/glslcc name: glslcc-linux - osx: + osx-arm64: runs-on: macos-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + - name: Setup Xcode version + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '14.3' + - name: build + shell: pwsh + run: | + cmake -B build -DCMAKE_BUILD_TYPE=Release "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15" + cmake --build build --config Release --target glslcc + lipo -info ./build/src/glslcc + - name: Upload + uses: actions/upload-artifact@v4 + with: + path: ./build/src/glslcc + name: glslcc-osx-arm64 + + osx-x64: + runs-on: macos-13 + steps: + - uses: actions/checkout@v4 - name: Setup Xcode version uses: maxim-lobanov/setup-xcode@v1 with: @@ -45,10 +65,11 @@ jobs: - name: build shell: pwsh run: | - cmake -B build -DCMAKE_BUILD_TYPE=Release + cmake -B build -DCMAKE_BUILD_TYPE=Release "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15" cmake --build build --config Release --target glslcc + lipo -info ./build/src/glslcc - name: Upload - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: ./build/src/glslcc - name: glslcc-osx + name: glslcc-osx-x64 \ No newline at end of file diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml index a966e086..0227f373 100644 --- a/.github/workflows/dist.yml +++ b/.github/workflows/dist.yml @@ -27,7 +27,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Check release version id: check_ver @@ -58,17 +58,21 @@ jobs: mkdir -p pkg_dir prefix=glslcc-${{ steps.check_ver.outputs.release_ver }} ls -l glslcc-linux - ls -l glslcc-osx + ls -l glslcc-osx-x64 + ls -l glslcc-osx-arm64 sudo chmod u+x ./glslcc-linux/glslcc - sudo chmod u+x ./glslcc-osx/glslcc + sudo chmod u+x ./glslcc-osx-x64/glslcc + sudo chmod u+x ./glslcc-osx-arm64/glslcc ls -l glslcc-linux - ls -l glslcc-osx + ls -l glslcc-osx-x64 + ls -l glslcc-osx-arm64 tar -czvf ./pkg_dir/$prefix-linux.tar.gz -C ./glslcc-linux glslcc - tar -czvf ./pkg_dir/$prefix-osx.tar.gz -C ./glslcc-osx glslcc - sh -c "cd ./glslcc-win64; zip ../pkg_dir/$prefix-win64.zip glslcc.exe" + tar -czvf ./pkg_dir/$prefix-osx-x64.tar.gz -C ./glslcc-osx-x64 glslcc + Invoke-WebRequest -Uri 'https://github.com/simdsoft/1kiss/releases/download/devtools/d3dcompiler_47.dll' -OutFile './glslcc-win64/d3dcompiler_47.dll' + sh -c "cd ./glslcc-win64; zip ../pkg_dir/$prefix-win64.zip glslcc.exe" - name: Publish to github release page if: ${{ steps.check_ver.outputs.release_ver != '' }} - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: tag_name: ${{ steps.check_ver.outputs.release_tag }} name: ${{ steps.check_ver.outputs.release_tag }}