Skip to content

Commit b1b11f8

Browse files
authored
Update MacOS to arm64 (#476)
1 parent 2c6fd57 commit b1b11f8

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'main'
77

88
env:
9-
BUILDER_VERSION: v0.9.55
9+
BUILDER_VERSION: v0.9.62
1010
BUILDER_SOURCE: releases
1111
BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
1212
PACKAGE_NAME: aws-c-http
@@ -140,15 +140,23 @@ jobs:
140140
run: |
141141
python .\aws-c-http\build\deps\aws-c-common\scripts\appverifier_ctest.py --build_directory .\aws-c-http\build\aws-c-http
142142
143-
osx:
144-
runs-on: macos-12 # latest
143+
macos:
144+
runs-on: macos-14 # latest
145145
steps:
146146
- name: Build ${{ env.PACKAGE_NAME }} + consumers
147147
run: |
148148
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
149149
chmod a+x builder
150150
./builder build -p ${{ env.PACKAGE_NAME }}
151151
152+
macos-x64:
153+
runs-on: macos-14-large # latest
154+
steps:
155+
- name: Build ${{ env.PACKAGE_NAME }} + consumers
156+
run: |
157+
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
158+
chmod a+x builder
159+
./builder build -p ${{ env.PACKAGE_NAME }}
152160
153161
localhost-test-linux:
154162
runs-on: ubuntu-20.04 # latest
@@ -160,13 +168,15 @@ jobs:
160168
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
161169
python3 builder.pyz build -p aws-c-http --cmake-extra=-DENABLE_LOCALHOST_INTEGRATION_TESTS=ON --config Debug
162170
163-
localhost-test-mac:
164-
runs-on: macos-13 # latest
171+
localhost-test-macos:
172+
runs-on: macos-14 # latest
165173
steps:
166174
- name: Checkout
167175
uses: actions/checkout@v3
168176
- name: Build and test
169177
run: |
178+
python3 -m venv .venv
179+
source .venv/bin/activate
170180
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
171181
python3 builder.pyz build -p aws-c-http --cmake-extra=-DENABLE_LOCALHOST_INTEGRATION_TESTS=ON --config Debug
172182

0 commit comments

Comments
 (0)