From 8172751f2a27d00ed39b32ba2f2b3fb13f8223ef Mon Sep 17 00:00:00 2001 From: kaizhangNV <149626564+kaizhangNV@users.noreply.github.com> Date: Thu, 27 Jun 2024 14:46:54 -0700 Subject: Switch from ubuntu-18 to centos-7 for older glibc build (#4496) --- .github/workflows/release-linux-glibc-2-17.yml | 61 +++++++++++++++++++++++++ .github/workflows/release-linux-glibc-2-27.yml | 63 -------------------------- deps/target-deps.json | 4 +- 3 files changed, 63 insertions(+), 65 deletions(-) create mode 100644 .github/workflows/release-linux-glibc-2-17.yml delete mode 100644 .github/workflows/release-linux-glibc-2-27.yml diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml new file mode 100644 index 000000000..98e895d7e --- /dev/null +++ b/.github/workflows/release-linux-glibc-2-17.yml @@ -0,0 +1,61 @@ +on: + push: + # Sequence of patterns matched against refs/tags + tags: + - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 + +name: centos7-gcc9 Release +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Check out the repo + uses: actions/checkout@v2 + with: + submodules: 'true' + fetch-depth: '0' + + # build the binary in docker image + - name: Run the build process with Docker + uses: addnab/docker-run-action@v3 + with: + image: slangdeveloper/centos7-gcc9 + options: -v ${{ github.workspace }}:/home/app -v /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt + run: | + source /opt/rh/devtoolset-9/enable + cd /home/app + git config --global --add safe.directory /home/app + export CC=gcc + export CONFIGURATION=release + export ARCH=x64 + export TARGETARCH=x64 + export TARGETARCH=x64 + export GLIBC_COMPATIBLE=1 + /bin/bash ./github_build.sh + + - name: CreatePackages + id: build + run: | + 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}-glibc-2.17.zip + export SLANG_BINARY_ARCHIVE_TAR=slang-${SLANG_TAG}-${SLANG_OS_NAME}-${SLANG_ARCH_NAME}-glibc-2.17.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-linux-glibc-2-27.yml b/.github/workflows/release-linux-glibc-2-27.yml deleted file mode 100644 index 8fcbecd0d..000000000 --- a/.github/workflows/release-linux-glibc-2-27.yml +++ /dev/null @@ -1,63 +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: - runs-on: ubuntu-latest - steps: - - name: Check out the repo - uses: actions/checkout@v2 - with: - submodules: 'true' - fetch-depth: '0' - - - name: build docker image - run: docker build -t ubuntu-18.04-gcc-9 ./.github/workflows/dockerfiles/ubuntu-18.04-x64 - - # build the binary in docker image - - name: Run the build process with Docker - uses: addnab/docker-run-action@v3 - with: - image: ubuntu-18.04-gcc-9 - options: -v ${{ github.workspace }}:/home/app - run: | - cd /home/app - git config --global --add safe.directory /home/app - export CC=gcc - export CONFIGURATION=release - export ARCH=x64 - export TARGETARCH=x64 - export TARGETARCH=x64 - export GLIBC_COMPATIBLE=1 - /bin/bash ./github_build.sh - - - name: CreatePackages - id: build - run: | - 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}-glibc-2.27.zip - export SLANG_BINARY_ARCHIVE_TAR=slang-${SLANG_TAG}-${SLANG_OS_NAME}-${SLANG_ARCH_NAME}-glibc-2.27.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/deps/target-deps.json b/deps/target-deps.json index b8eb77ae4..250d5fa1a 100644 --- a/deps/target-deps.json +++ b/deps/target-deps.json @@ -17,14 +17,14 @@ }, { "name" : "slang-glslang", - "baseUrl" : "https://github.com/shader-slang/slang-glslang/releases/download/v13.0.0.x-j/slang-glslang-13.0.0.x-j-", + "baseUrl" : "https://github.com/shader-slang/slang-glslang/releases/download/v13.0.0.x-k/slang-glslang-13.0.0.x-k-", "optional" : true, "packages" : { "windows-x86_64" : { "type" : "url", "path" : "windows-x64-release.zip" }, "windows-x86" : { "type": "url", "path" : "windows-win32-release.zip" }, "linux-x86_64" : { "type": "url", "path" : "linux-x64-release.zip" }, - "linux-x86_64-glibc-2.27" : { "type": "url", "path" : "linux-x64-release-glibc-2.27.zip" }, + "linux-x86_64-glibc-2.27" : { "type": "url", "path" : "linux-x64-release-glibc-2.17.zip" }, "linux-x86" : { "type": "url", "path" : "linux-x86-release.zip" }, "macosx-x86_64" : { "type": "url", "path" : "macosx-x86_64-release.zip" }, "windows-aarch64" : { "type" : "url", "path" : "windows-aarch64-release.zip" } -- cgit v1.2.3