Skip to content

Commit e2f1401

Browse files
authored
Update build.yml
1 parent 505041d commit e2f1401

1 file changed

Lines changed: 5 additions & 18 deletions

File tree

.github/workflows/build.yml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,10 @@ on:
44
push:
55
pull_request:
66
workflow_dispatch:
7-
inputs:
8-
forceMacBuild:
9-
description: 'If set true override the ENABLE_MACOS_BUILD to force a build'
10-
type: boolean
11-
default: false
127

138
env:
149
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
1510
BUILD_TYPE: Release
16-
MACENABLED: ${{ inputs.forceMacBuild }}
1711

1812
# for matrix check https://docs.github.com/en/actions/reference/specifications-for-github-hosted-runners
1913
jobs:
@@ -41,14 +35,14 @@ jobs:
4135
steps:
4236
- name: Checkout the source
4337
if: github.event_name != 'pull_request'
44-
uses: actions/checkout@v2
38+
uses: actions/checkout@v4
4539
with:
4640
submodules: recursive
4741
fetch-depth: 0
4842

4943
- name: Checkout the source - pull request
5044
if: github.event_name == 'pull_request'
51-
uses: actions/checkout@v2
45+
uses: actions/checkout@v4
5246
with:
5347
submodules: recursive
5448
fetch-depth: 0
@@ -60,19 +54,12 @@ jobs:
6054
sudo xcode-select -switch /Applications/Xcode_${{matrix.build-xcode-version}}.app
6155
6256
- name: Setup python version
63-
uses: actions/setup-python@v1
57+
uses: actions/setup-python@v5
6458
with:
6559
python-version: "3.11"
6660

67-
# windows-2016 need the SSHAgentFeature added
6861
- name: Start ssh key agent
69-
if: matrix.os == 'windows-2016'
70-
run: |
71-
choco install --no-progress -my openssh --params '"/SSHAgentFeature"'
72-
refreshenv
73-
74-
- name: Start ssh key agent
75-
uses: webfactory/ssh-agent@v0.5.0
62+
uses: webfactory/ssh-agent@v0.9.0
7663
with:
7764
ssh-private-key: ${{ secrets.RULESSUPPORT_DEPLOY_KEY }}
7865

@@ -110,7 +97,7 @@ jobs:
11097
conan-cxx: g++-${{matrix.build-cversion}}
11198

11299
- name: Mac build
113-
if: startsWith(matrix.os, 'macos') && (env.MACENABLED == 'true' || vars.ENABLE_MACOS_BUILD == 'True')
100+
if: startsWith(matrix.os, 'macos')
114101
uses: ManiVaultStudio/github-actions/conan_linuxmac_build@main
115102
with:
116103
conan-compiler: ${{matrix.build-compiler}}

0 commit comments

Comments
 (0)