Skip to content

Commit

Permalink
Support macOS 13 and trigger builds on pull request for release branc…
Browse files Browse the repository at this point in the history
…hes (#327 | GRIDEDIT-1035, GRIDEDIT-1039)
  • Loading branch information
ahmad-el-sayed authored May 6, 2024
1 parent ab0faf2 commit 1449a8a
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 28 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: Build and test
name: Build and test (feature/master)

on:
push:
branches:
- master
- "feature/**"
pull_request:
types:
Expand All @@ -19,8 +20,8 @@ jobs:
fail-fast: false
matrix:
platform:
- macos-12
- macos-14
- macos-12 # x86_64 (free)
- macos-14 # arm64 (free)
build_type:
- Release

Expand Down
25 changes: 0 additions & 25 deletions .github/workflows/build-and-test-master-release.yml

This file was deleted.

32 changes: 32 additions & 0 deletions .github/workflows/build-and-test-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Build and test (release)

on:
push:
branches:
- 'release/v[0-9]+\.[0-9]+\.[0-9]+'
pull_request:
types:
- opened # triggers build when opened
- synchronize # triggers build when commits are pushed to HEAD
branches:
- 'release/v[0-9]+\.[0-9]+\.[0-9]+'
# Manual trigger
workflow_dispatch:

jobs:
build:
strategy:
fail-fast: false
matrix:
platform:
- macos-12 # x86_64 (free)
- macos-13 # x86_64 (free)
- macos-13-xlarge # arm64 (billable)
- macos-14 # arm64 (free)
build_type:
- Release

uses: ./.github/workflows/build-and-test-workflow.yml
with:
platform: ${{ matrix.platform }}
build_type: ${{ matrix.build_type }}
4 changes: 4 additions & 0 deletions .github/workflows/build-and-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ jobs:
with:
fetch-depth: 0

- name: Set Xcode version
if: inputs.platform == 'macos-13' || inputs.platform == 'macos-13-xlarge'
run: sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer

# Step: Set paths
- name: Set paths
id: paths
Expand Down

0 comments on commit 1449a8a

Please sign in to comment.