From 029162306948ffbff63e1465ea4c4853d8f37c71 Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Thu, 10 Oct 2024 20:30:44 +0300 Subject: [PATCH] Revert inadvertent changes to the release workflow. (#5345) Reverts commit 684cf052491107689021fdb41b0a53e11eafafc5 from #5343 that was not reverted before merging the PR. --- TYPE: NO_HISTORY --- .github/workflows/release.yml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f712ef42900..eaee179e12b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,16 +1,10 @@ name: Release on: - pull_request: - branches: - - dev - - 'release-*' - - '*' push: branches: - dev - 'release-*' - - '*' tags: - '*' @@ -20,7 +14,6 @@ jobs: matrix: os: [ubuntu-20.04] runs-on: ${{ matrix.os }} - if: false steps: - name: Checkout TileDB uses: actions/checkout@v3 @@ -48,7 +41,11 @@ jobs: strategy: fail-fast: false matrix: + platform: [macos-arm64, macos-x86_64, linux-x86_64, linux-x86_64-noavx2, windows-x86_64] include: + - platform: windows-x86_64 + os: windows-2019 + triplet: x64-windows-release - platform: linux-x86_64 os: ubuntu-20.04 manylinux: true @@ -58,9 +55,19 @@ jobs: cmake_args: -DCOMPILER_SUPPORTS_AVX2=OFF triplet: x64-linux-release manylinux: true + - platform: macos-x86_64 + os: macos-12 + MACOSX_DEPLOYMENT_TARGET: 11 + triplet: x64-osx-release + - platform: macos-arm64 + os: macos-12 + cmake_args: -DCMAKE_OSX_ARCHITECTURES=arm64 + MACOSX_DEPLOYMENT_TARGET: 11 + triplet: arm64-osx-release runs-on: ${{ matrix.os }} container: ${{ matrix.manylinux && 'quay.io/pypa/manylinux2014_x86_64' || '' }} env: + MACOSX_DEPLOYMENT_TARGET: ${{ matrix.MACOSX_DEPLOYMENT_TARGET }} VCPKG_BINARY_SOURCES: 'clear;x-gha,readwrite' # Manylinux does not support Node 20 due to libc incompatibility. Temporarily opt out. # https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/ @@ -192,7 +199,7 @@ jobs: issues: write runs-on: ubuntu-latest needs: Publish-Release - if: false && (failure() || cancelled()) && github.event_name != 'workflow_dispatch' + if: (failure() || cancelled()) && github.event_name != 'workflow_dispatch' steps: # The open-issue action requires to clone the repository. - name: Checkout TileDB