Skip to content

Commit 42b0453

Browse files
committed
Test macos suite
1 parent 5d8a1f5 commit 42b0453

File tree

2 files changed

+76
-4
lines changed

2 files changed

+76
-4
lines changed

.github/actions/setup-build/action.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ runs:
1212
repository: 'awslabs/aws-kotlin-repo-tools'
1313
sparse-checkout: |
1414
.github
15+
1516
- name: Checkout aws-crt-kotlin
1617
uses: ./aws-kotlin-repo-tools/.github/actions/checkout-head
1718
with:
1819
# checkout aws-crt-kotlin as a sibling which will automatically make it an included build
1920
path: 'aws-crt-kotlin'
2021
repository: 'awslabs/aws-crt-kotlin'
22+
2123
- name: Configure JDK
2224
uses: actions/setup-java@v3
2325
with:

.github/workflows/continuous-integration.yml renamed to .github/workflows/ci.yml

Lines changed: 74 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ concurrency:
1414
env:
1515
RUN: ${{ github.run_id }}-${{ github.run_number }}
1616
GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dkotlin.incremental=false"
17+
# generated dockcross scripts default to `podman` when installed which
18+
# has issues when building with docker then executing via dockcross script which
19+
# picks up `podman` instead.
20+
OCI_EXE: docker
1721

1822
jobs:
1923
jvm:
@@ -41,12 +45,14 @@ jobs:
4145
run: |
4246
./gradlew -Paws.kotlin.native=false -Ptest.java.version=${{ matrix.java-version }} jvmTest --stacktrace
4347
44-
all-platforms:
45-
runs-on: ${{ matrix.os }}
48+
# macos-14 build and test for targets: jvm, macoArm64, iosSimulatorArm64, watchosSimulatorArm65, tvosSimulatorArm64
49+
# macos-13 build and test for targets: jvm, macoX64, iosX64, tvosX64, watchosX64
50+
macos:
4651
strategy:
4752
fail-fast: false
4853
matrix:
49-
os: [ ubuntu-latest, macos-latest, windows-latest ]
54+
os: [macos-14, macos-13]
55+
runs-on: ${{ matrix.os }}
5056
steps:
5157
- name: Checkout sources
5258
uses: actions/checkout@v4
@@ -61,14 +67,78 @@ jobs:
6167
# FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
6268
# echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
6369
./gradlew apiCheck
64-
./gradlew allTests
70+
./gradlew -Paws.sdk.kotlin.crt.disableCrossCompile=true build
71+
./gradlew -Paws.sdk.kotlin.crt.disableCrossCompile=true allTests
6572
- name: Save Test Reports
6673
if: failure()
6774
uses: actions/upload-artifact@v3
6875
with:
6976
name: test-reports-${{ matrix.os }}
7077
path: '**/build/reports'
7178

79+
# # build and test for targets: jvm, linuxX64
80+
# # cross compile for: linuxX64, linuxArm64
81+
# # TODO - add mingw as cross compile target
82+
# linux:
83+
# runs-on: ubuntu-22.04
84+
# steps:
85+
# - name: Checkout sources
86+
# uses: actions/checkout@v4
87+
# with:
88+
# path: 'smithy-kotlin'
89+
#
90+
# - name: Setup build
91+
# uses: ./smithy-kotlin/.github/actions/setup-build
92+
#
93+
# - name: Configure CRT Docker Images
94+
# run: |
95+
# ./aws-crt-kotlin/docker-images/build-all.sh
96+
#
97+
# - name: Test
98+
# working-directory: ./smithy-kotlin
99+
# shell: bash
100+
# run: |
101+
# # FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
102+
# # echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
103+
# ./gradlew apiCheck
104+
# ./gradlew build
105+
# ./gradlew allTests
106+
#
107+
# - name: Save Test Reports
108+
# if: failure()
109+
# uses: actions/upload-artifact@v3
110+
# with:
111+
# name: test-reports-${{ matrix.os }}
112+
# path: '**/build/reports'
113+
114+
# all-platforms:
115+
# runs-on: ${{ matrix.os }}
116+
# strategy:
117+
# fail-fast: false
118+
# matrix:
119+
# os: [ ubuntu-latest, macos-latest, windows-latest ]
120+
# steps:
121+
# - name: Checkout sources
122+
# uses: actions/checkout@v4
123+
# with:
124+
# path: 'smithy-kotlin'
125+
# - name: Setup build
126+
# uses: ./smithy-kotlin/.github/actions/setup-build
127+
# - name: Test
128+
# working-directory: ./smithy-kotlin
129+
# shell: bash
130+
# run: |
131+
# # FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
132+
# # echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
133+
# ./gradlew apiCheck
134+
# ./gradlew allTests
135+
# - name: Save Test Reports
136+
# if: failure()
137+
# uses: actions/upload-artifact@v3
138+
# with:
139+
# name: test-reports-${{ matrix.os }}
140+
# path: '**/build/reports'
141+
72142
protocol-tests:
73143
runs-on: ubuntu-latest
74144
steps:

0 commit comments

Comments
 (0)