Merge pull request shader-slang#26 from kaizhangNV/master

Switch from ubuntu-18 to CentOS-7 build
kaizhangNV · Jun 27, 2024 · f45b629 · f45b629
2 parents 9ac69c5 + 905360e
commit f45b629
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 25 deletions.
diff --git a/.github/workflows/dockerfiles/ubuntu-18.04-x64/Dockerfile b/.github/workflows/dockerfiles/ubuntu-18.04-x64/Dockerfile
diff --git a/...ub/workflows/release-linux-glibc-2-27.yml → ...ub/workflows/release-linux-glibc-2-17.yml b/...ub/workflows/release-linux-glibc-2-27.yml → ...ub/workflows/release-linux-glibc-2-17.yml
@@ -1,11 +1,11 @@
-name: CI Release Linux
+name: CI Release Linux-CentOS-7
 
 on:
   push:
     # Sequence of patterns matched against refs/tags
     tags:
     - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
-    
+
 jobs:
   build:
     name: Upload Asset - Linux
@@ -24,17 +24,14 @@ jobs:
           # Build from the tag that triggered the build
           ref: ${{github.ref_name}}
 
-        # build a docker image based on ubuntu 18.04
-      - 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
+        # 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
+            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
               PREMAKE=external/slang-binaries/premake/premake-5.0.0-alpha16/bin/linux-64/premake5
@@ -55,7 +52,7 @@ jobs:
           echo "tag:$TAG_NAME"
           echo "glslang-version:$GLSLANG_VERSION"
 
-          BIN_ARCHIVE="slang-glslang-$GLSLANG_VERSION-linux-${{matrix.platform}}-${{matrix.configuration}}-glibc-2.27.zip"
+          BIN_ARCHIVE="slang-glslang-$GLSLANG_VERSION-linux-${{matrix.platform}}-${{matrix.configuration}}-glibc-2.17.zip"
 
           zip "$BIN_ARCHIVE" README.md
           zip "$BIN_ARCHIVE" LICENSE