From 5e4bff902bfea0030e2ab8d9472d11c2c42bb4ce Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 11 Feb 2022 17:45:14 -0700 Subject: [PATCH] gpu-dawn: disable aarch64-macos / x86_64-linux CI runners for now Signed-off-by: Stephen Gutekanst --- gpu-dawn/.github/workflows/ci.yml | 47 ++++++++++++++-------------- gpu-dawn/.github/workflows/m1_ci.yml | 34 +++++++++++--------- 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/gpu-dawn/.github/workflows/ci.yml b/gpu-dawn/.github/workflows/ci.yml index b3dfbb55..3903101d 100644 --- a/gpu-dawn/.github/workflows/ci.yml +++ b/gpu-dawn/.github/workflows/ci.yml @@ -5,29 +5,30 @@ on: types: - completed jobs: - x86_64-linux: - runs-on: ubuntu-latest - # We want to run on external PRs, but not on our own internal PRs as they'll be run by the push - # to the branch. - if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Setup Zig - run: | - sudo apt install xz-utils - sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.670+e1a535360.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - - name: Clone mach-glfw - run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - - name: install - run: zig build install && find zig-out/ - - name: upload - run: | - mv zig-out/lib/libdawn.a zig-out/lib/libdawn_x86_64-linux.a - gzip -9 zig-out/lib/libdawn_x86_64-linux.a - gh release upload $(git rev-parse --short HEAD) zig-out/lib/libdawn_x86_64-linux.a.gz - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # TODO(build-system): enable x86 Linux CI here, dependency cycle in build.zig + # x86_64-linux: + # runs-on: ubuntu-latest + # # We want to run on external PRs, but not on our own internal PRs as they'll be run by the push + # # to the branch. + # if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository + # steps: + # - name: Checkout + # uses: actions/checkout@v2 + # - name: Setup Zig + # run: | + # sudo apt install xz-utils + # sudo sh -c 'wget -c https://ziglang.org/builds/zig-linux-x86_64-0.10.0-dev.670+e1a535360.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + # - name: Clone mach-glfw + # run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw + # - name: install + # run: zig build install && find zig-out/ + # - name: upload + # run: | + # mv zig-out/lib/libdawn.a zig-out/lib/libdawn_x86_64-linux.a + # gzip -9 zig-out/lib/libdawn_x86_64-linux.a + # gh release upload $(git rev-parse --short HEAD) zig-out/lib/libdawn_x86_64-linux.a.gz + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # TODO(build-system): enable windows CI here once gpu-dawn builds under Windows # x86_64-windows: # runs-on: windows-latest diff --git a/gpu-dawn/.github/workflows/m1_ci.yml b/gpu-dawn/.github/workflows/m1_ci.yml index 0bdafc46..a23ded9a 100644 --- a/gpu-dawn/.github/workflows/m1_ci.yml +++ b/gpu-dawn/.github/workflows/m1_ci.yml @@ -11,21 +11,25 @@ jobs: run: shell: "/usr/bin/arch -arch arm64e /bin/bash --noprofile --norc -eo pipefail {0}" steps: - - name: Checkout - uses: actions/checkout@v2 + # TODO(build-system): remove this step, uncomment the steps below, and fix the M1 CI runner. - name: Setup Zig run: | zig version - - name: Clone mach-glfw - run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - - name: install - run: zig build install && find zig-out/ - env: - AGREE: true - - name: upload - run: | - mv zig-out/lib/libdawn.a zig-out/lib/libdawn_aarch64-macos.a - gzip -9 zig-out/lib/libdawn_aarch64-macos.a - gh release upload $(git rev-parse --short HEAD) zig-out/lib/libdawn_aarch64-macos.a.gz - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - name: Checkout + # uses: actions/checkout@v2 + # - name: Setup Zig + # run: | + # zig version + # - name: Clone mach-glfw + # run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw + # - name: install + # run: zig build install && find zig-out/ + # env: + # AGREE: true + # - name: upload + # run: | + # mv zig-out/lib/libdawn.a zig-out/lib/libdawn_aarch64-macos.a + # gzip -9 zig-out/lib/libdawn_aarch64-macos.a + # gh release upload $(git rev-parse --short HEAD) zig-out/lib/libdawn_aarch64-macos.a.gz + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}