Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/actions/common-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,11 @@ runs:
uses: ilammy/msvc-dev-cmd@v1

- name: Install dependencies (Linux only)
if: inputs.os == 'linux'
shell: bash
run: |
if [[ "${{ inputs.os }}" == "linux" ]]; then
sudo apt-get update
sudo apt-get install -y libx11-dev
fi
sudo apt-get update
sudo apt-get install -y libx11-dev

- name: Setup Node.js (Linux only)
if: inputs.os == 'linux'
Expand Down
32 changes: 6 additions & 26 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@ jobs:
compiler: gcc,
build-slang-llvm: false,
}
- { os: windows, runs-on: windows-latest, compiler: cl }
- {
os: windows,
runs-on: ["Windows", "self-hosted", "GCP-T4"],
compiler: cl,
}
- { os: macos, runs-on: macos-latest, compiler: clang }

- { build-slang-llvm: false }
Expand All @@ -58,12 +62,7 @@ jobs:
with:
submodules: "recursive"
fetch-depth: "0"
- name: Install dependencies
run: |
if [[ "${{ matrix.os }}" == "linux" ]]; then
sudo apt-get update
sudo apt-get install -y libx11-dev
fi

- name: Setup
uses: ./.github/actions/common-setup
with:
Expand All @@ -79,25 +78,6 @@ jobs:
mkdir build-platform-generators
cmake --install build --config Release --component generators --prefix build-platform-generators

- name: Change dev tools to host arch (windows)
uses: ilammy/msvc-dev-cmd@v1
with:
arch: ${{matrix.platform == 'aarch64' && 'amd64_arm64' || 'amd64'}}
sdk: "10.0.19041.0"

- name: Change dev tools to host arch (linux and macos)
run: |
if [[ "${{matrix.os}}" == linux* && "${{matrix.platform}}" == "aarch64" && "$(uname -m)" != "aarch64" ]]; then
export CC=aarch64-linux-gnu-gcc
export CXX=aarch64-linux-gnu-g++
fi
CMAKE_OSX_ARCHITECTURES="${{matrix.platform}}"
CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES//aarch64/arm64}

echo "CC=$CC" >> "$GITHUB_ENV"
echo "CXX=$CXX" >> "$GITHUB_ENV"
echo "CMAKE_OSX_ARCHITECTURES=$CMAKE_OSX_ARCHITECTURES" >> "$GITHUB_ENV"

- name: Build Slang
run: |
if [[ "${{ matrix.platform }}" == "wasm" ]]; then
Expand Down