Skip to content

Commit a82d7a8

Browse files
authored
chore: TOOLS-3144 Update macOS build matrix to remove macos-13 (#114)
* chore: TOOLS-3144 Update macOS build matrix to remove macos-13 * chore: upgrade actions/checkout from v3 to v4 in workflow files
1 parent 400fce7 commit a82d7a8

File tree

3 files changed

+11
-19
lines changed

3 files changed

+11
-19
lines changed

.github/workflows/backup-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
path: aws-sdk-cpp
4646
key: aws-sdk-cpp-build-and-test-${{ env.AWS_SDK_CPP_VERSION }}-${{ runner.os }}
4747
- name: Download AWS C++ sdk
48-
uses: actions/checkout@v3
48+
uses: actions/checkout@v4
4949
if: steps.cache-aws-sdk-cpp.outputs.cache-hit != 'true'
5050
with:
5151
repository: aws/aws-sdk-cpp
@@ -64,7 +64,7 @@ jobs:
6464
cd aws-sdk-cpp/build
6565
sudo make install
6666
- name: Download zstd
67-
uses: actions/checkout@v3
67+
uses: actions/checkout@v4
6868
with:
6969
repository: facebook/zstd
7070
submodules: recursive
@@ -115,7 +115,7 @@ jobs:
115115
sudo make install
116116
sudo ldconfig
117117
- name: Checkout c client
118-
uses: actions/checkout@v3
118+
uses: actions/checkout@v4
119119
with:
120120
repository: aerospike/aerospike-client-c
121121
submodules: recursive
@@ -125,7 +125,7 @@ jobs:
125125
run: make
126126
working-directory: client
127127
- name: Checkout asbackup
128-
uses: actions/checkout@v3
128+
uses: actions/checkout@v4
129129
with:
130130
path: main
131131
submodules: recursive

.github/workflows/draft-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
name: Draft Release
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- name: Upload Artifacts to Release Draft
1616
uses: "softprops/action-gh-release@v1"
1717
with:

.github/workflows/mac-artifact.yml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,8 @@ jobs:
1515
build:
1616
strategy:
1717
matrix:
18-
os: [macos-13, macos-14, macos-15]
18+
os: [macos-14, macos-15]
1919
include:
20-
- os: macos-13
21-
openssl-path: /usr/local/opt/openssl
22-
zstd-path: /usr/local
23-
aws-sdk-path: /usr/local
24-
curl-path: /usr/local
25-
ssh2-path: /usr/local
26-
uv-path: /usr/local
27-
jansson-path: /usr/local
2820
- os: macos-14
2921
openssl-path: /opt/homebrew/opt/openssl
3022
zstd-path: /opt/homebrew
@@ -99,7 +91,7 @@ jobs:
9991
path: aws-sdk-cpp-${{ env.AWS_SDK_CPP_VERSION }}
10092
key: aws-sdk-cpp-${{ env.cache-index }}-mac-artifact-${{ env.AWS_SDK_CPP_VERSION }}-${{ matrix.os }}-${{ runner.arch }}-cmake-${{ env.CMAKE_VERSION }}
10193
- name: Download AWS C++ sdk
102-
uses: actions/checkout@v3
94+
uses: actions/checkout@v4
10395
if: steps.cache-aws-sdk-cpp.outputs.cache-hit != 'true'
10496
with:
10597
repository: aws/aws-sdk-cpp
@@ -123,7 +115,7 @@ jobs:
123115
path: libssh2-${{ env.LIBSSH2_VERSION }}
124116
key: libssh2-v2-${{ env.LIBSSH2_VERSION }}-${{ env.cache-index }}-${{ matrix.os }}-${{ runner.arch }}-cmake-${{ env.CMAKE_VERSION }}
125117
- name: Download libssh2
126-
uses: actions/checkout@v3
118+
uses: actions/checkout@v4
127119
if: steps.cache-libssh2.outputs.cache-hit != 'true'
128120
with:
129121
repository: libssh2/libssh2
@@ -152,7 +144,7 @@ jobs:
152144
path: curl-${{ env.LIBCURL_VERSION }}
153145
key: curl-v2-${{ env.LIBCURL_VERSION }}-${{ env.cache-index }}-${{ matrix.os }}-${{ runner.arch }}-cmake-${{ env.CMAKE_VERSION }}
154146
- name: Download libcurl
155-
uses: actions/checkout@v3
147+
uses: actions/checkout@v4
156148
if: steps.cache-libcurl.outputs.cache-hit != 'true'
157149
with:
158150
repository: curl/curl
@@ -171,7 +163,7 @@ jobs:
171163
sudo make install
172164
working-directory: curl-${{ env.LIBCURL_VERSION }}/build
173165
- name: Download zstd
174-
uses: actions/checkout@v3
166+
uses: actions/checkout@v4
175167
with:
176168
repository: facebook/zstd
177169
submodules: recursive
@@ -197,7 +189,7 @@ jobs:
197189
working-directory: zstd-${{ env.ZSTD_VERSION }}
198190
# this will checkout the whole tools repo when run from aerospike-tools, but we will
199191
# just cd into the correct directory calculated from working-dir
200-
- uses: actions/checkout@v2
192+
- uses: actions/checkout@v4
201193
if: steps.cache-asbackup.outputs.cache-hit != 'true'
202194
with:
203195
path: ${{ steps.checkout-dir.outputs.value }}

0 commit comments

Comments
 (0)