Skip to content

Fix Windows x86 CI #360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Mar 24, 2022
Merged

Fix Windows x86 CI #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
44e7f38
Fix Windows x86 CI
graebm Nov 30, 2021
e27a948
Fix MSVC compiler warning
graebm Nov 30, 2021
e8fe366
Merge branch 'main' into windows-variants
xiazhvera Mar 23, 2022
80e9abe
update windows image to support vs2015 tool chain
xiazhvera Mar 23, 2022
806a1b1
append cmake options to build samples
xiazhvera Mar 23, 2022
d0fa300
fix syntax
xiazhvera Mar 23, 2022
b9bf67e
add builder args
xiazhvera Mar 23, 2022
5a49d03
add builder args
xiazhvera Mar 23, 2022
d63ca5f
test to see if cmake-extra get appened
xiazhvera Mar 23, 2022
b88806f
import argparse
xiazhvera Mar 23, 2022
8c87a16
clean up test messages
xiazhvera Mar 23, 2022
cca9e11
improve python style
xiazhvera Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .builder/actions/build_samples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Builder
import os
import sys
import argparse


class BuildSamples(Builder.Action):
Expand All @@ -9,6 +10,11 @@ def run(self, env):
print('skip_samples is defined. Skipping samples...')
return

# parse extra cmake configs
parser = argparse.ArgumentParser()
parser.add_argument('--cmake-extra', action='append', default=[])
cmd_args = parser.parse_known_args(env.args.args)[0]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CLEVER!


steps = []
samples = [
'samples/mqtt/basic_pub_sub',
Expand All @@ -28,6 +34,8 @@ def run(self, env):
f'-H{sample_path}',
f'-DCMAKE_PREFIX_PATH={env.install_dir}',
'-DCMAKE_BUILD_TYPE=RelWithDebInfo'])
# append extra cmake configs
steps[-1].extend(cmd_args.cmake_extra)
steps.append(['cmake',
'--build', build_path,
'--config', 'RelWithDebInfo'])
Expand Down
16 changes: 5 additions & 11 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,34 +75,28 @@ jobs:
aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DUSE_CPU_EXTENSIONS=OFF

windows-vs16:
windows:
runs-on: windows-latest
steps:
- name: Build ${{ env.PACKAGE_NAME }} + consumers
run: |
md D:\a\work
cd D:\a\work
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz', 'builder.pyz')"
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream
python builder.pyz build -p ${{ env.PACKAGE_NAME }}

windows-vs14:
runs-on: windows-latest
runs-on: windows-2019 # windows-2019 is last env with Visual Studio 2015 (v14.0)
strategy:
matrix:
arch: [x86, x64]
arch: [Win32, x64]
steps:
- uses: ilammy/msvc-dev-cmd@v1
with:
toolset: 14.0
arch: ${{ matrix.arch }}
uwp: false
spectre: true
- name: Build ${{ env.PACKAGE_NAME }} + consumers
run: |
md D:\a\work
cd D:\a\work
python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --spec=downstream
python builder.pyz build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-Tv140 --cmake-extra=-A${{ matrix.arch }}

windows-no-cpu-extensions:
runs-on: windows-latest
Expand Down