Skip to content

Commit 86bcee3

Browse files
committed
disable docker images on Windows, install MSYS2
1 parent 81299bb commit 86bcee3

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,14 @@ jobs:
186186
run: |
187187
./aws-crt-kotlin/docker-images/build-images.sh linux-x64 linux-arm64
188188
189-
- name: Configure Windows CRT Docker Images
190-
shell: bash
189+
- name: Set up MSYS2
191190
if: ${{ matrix.os == 'windows-latest' }}
192-
run: |
193-
./aws-crt-kotlin/docker-images/build-images.sh mingw-x64
191+
uses: msys2/setup-msys2@v2
192+
with:
193+
msystem: MINGW64
194+
install: >-
195+
mingw-w64-x86_64-cmake
196+
mingw-w64-x86_64-gcc
194197
195198
- name: Sanity checks
196199
shell: bash
@@ -213,12 +216,23 @@ jobs:
213216
done
214217
215218
- name: Test
219+
if: ${{ matrix.os != 'windows-latest' }}
216220
working-directory: ./smithy-kotlin
217221
shell: bash
218222
run: |
219223
# FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
220224
# echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
221225
./gradlew build
226+
227+
- name: Test on Windows
228+
if: ${{ matrix.os == 'windows-latest' }}
229+
working-directory: ./smithy-kotlin
230+
shell: msys2 {0}
231+
run: |
232+
# FIXME K2. Re-enable warnings as errors after this warning is removed: https://youtrack.jetbrains.com/issue/KT-68532
233+
# echo "kotlinWarningsAsErrors=true" >> $GITHUB_WORKSPACE/local.properties
234+
./gradlew build -Paws.crt.disableContainerTargets=mingw_x64
235+
222236
- name: Save Test Reports
223237
if: failure()
224238
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)