From 2695e0ad1f2afe3104b0f632eda9c8503535463d Mon Sep 17 00:00:00 2001 From: dave caruso Date: Wed, 1 Nov 2023 01:26:16 -0700 Subject: [PATCH] confirmed works now --- .github/workflows/build.yml | 5 ++--- .github/workflows/windows.yml | 39 ----------------------------------- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 .github/workflows/windows.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 398f8d9b9ac01..a2e110879f598 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -151,6 +151,7 @@ jobs: name: ${{matrix.label}} path: ${{runner.temp}}/bun-webkit.tar.gz +jobs: windows: strategy: matrix: @@ -161,12 +162,10 @@ jobs: runs-on: windows-latest timeout-minutes: 90 steps: - - uses: ilammy/msvc-dev-cmd@7315a94840631165970262a99c72cfb48a65d25d - with: - arch: ${{ matrix.arch }} - uses: KyleMayes/install-llvm-action@1a3da29f56261a1e1f937ec88f0856a9b8321d7e with: version: 16.0.6 + - uses: cygwin/cygwin-install-action@006ad0b0946ca6d0a3ea2d4437677fa767392401 - run: choco install -y ninja - uses: actions/checkout@v4 - name: Build WebKit diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml deleted file mode 100644 index 7ca4db70f3e4f..0000000000000 --- a/.github/workflows/windows.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: CI - -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the "master" branch - push: - branches: ["icu-build-test"] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -jobs: - windows: - strategy: - matrix: - include: - - runner: windows-latest - build-type: Release - arch: amd64 - runs-on: windows-latest - timeout-minutes: 90 - steps: - - uses: KyleMayes/install-llvm-action@1a3da29f56261a1e1f937ec88f0856a9b8321d7e - with: - version: 16.0.6 - - uses: cygwin/cygwin-install-action@006ad0b0946ca6d0a3ea2d4437677fa767392401 - - run: choco install -y ninja - - uses: actions/checkout@v4 - - name: Build WebKit - run: | - $env:Path = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\;" + $env:Path - $env:WEBKIT_OUTPUT_DIR = "bun-webkit" - $env:BUN_WEBKIT_VERSION = "${{ github.sha }}" - $env:CMAKE_BUILD_TYPE = "${{matrix.build-type}}" - ./windows-release.ps1 - - uses: actions/upload-artifact@v3 - with: - name: bun-webkit-windows-${{ matrix.arch }} - path: bun-webkit.tar.gz