diff options
| -rw-r--r-- | .github/workflows/ci.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/release-linux-glibc-2-17.yml | 65 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 3 |
3 files changed, 7 insertions, 68 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 498aa8dc4..62da40295 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: - { os: macos, compiler: gcc } - { os: macos, compiler: cl } include: - - { os: linux, runs-on: ubuntu-latest } + - { os: linux, runs-on: ubuntu-22.04 } - { os: macos, runs-on: macos-latest } - { os: windows, runs-on: windows-latest } # Warnings are treated as errors by default. @@ -123,6 +123,11 @@ jobs: sudo apt-get update sudo apt-get install -y libx11-dev fi + - name: Setup Node.js + if: matrix.os == 'linux' + uses: actions/setup-node@v4 + with: + node-version: "20.x" - name: Setup if: steps.filter.outputs.should-run == 'true' uses: ./.github/actions/common-setup diff --git a/.github/workflows/release-linux-glibc-2-17.yml b/.github/workflows/release-linux-glibc-2-17.yml deleted file mode 100644 index 141efb4c2..000000000 --- a/.github/workflows/release-linux-glibc-2-17.yml +++ /dev/null @@ -1,65 +0,0 @@ -on: - push: - tags: - - "v*" - -name: centos7-gcc9 Release -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - submodules: "recursive" - 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:cmake - options: -v ${{ github.workspace }}:/home/app -v /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt - run: | - export PATH=$PATH:/cmake-3.30.0-linux-x86_64/bin/ - - source /opt/rh/devtoolset-9/enable - - cd /home/app - git config --global --add safe.directory /home/app - cmake --preset default --fresh -DSLANG_SLANG_LLVM_FLAVOR=DISABLE - cmake --build --preset release - cpack --preset release -G ZIP - cpack --preset release -G TGZ - - - name: Package Slang - id: package - run: | - triggering_ref=${{ github.ref_name }} - if [[ $triggering_ref =~ ^v[0-9] ]]; then - version=${triggering_ref#v} - else - version=$triggering_ref - fi - base=$(pwd)/slang-${version}-linux-x86_64-glibc-2.17 - - sudo mv "$(pwd)/build/dist-release/slang.zip" "${base}.zip" - echo "SLANG_BINARY_ARCHIVE_ZIP=${base}.zip" >> "$GITHUB_OUTPUT" - - sudo mv "$(pwd)/build/dist-release/slang.tar.gz" "${base}.tar.gz" - echo "SLANG_BINARY_ARCHIVE_TAR=${base}.tar.gz" >> "$GITHUB_OUTPUT" - - - name: File check - run: | - find "build/dist-release" -print0 ! -iname '*.md' ! -iname '*.h' -type f | xargs -0 file - - - name: UploadBinary - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/v') - with: - draft: ${{contains(github.ref, 'draft')}} - prerelease: ${{contains(github.ref, 'draft')}} - files: | - ${{ steps.package.outputs.SLANG_BINARY_ARCHIVE_ZIP }} - ${{ steps.package.outputs.SLANG_BINARY_ARCHIVE_TAR }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d1e4b923a..f2cf299c8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,6 @@ on: - "README.md" tags: - "v*" - jobs: release: strategy: @@ -28,7 +27,7 @@ jobs: - { os: linux, platform: x86_64, - runs-on: ubuntu-latest, + runs-on: ubuntu-22.04, compiler: gcc, } - { |