Skip to content

Commit ef99046

Browse files
committed
Merge branch 'main' of github.com:awslabs/aws-kotlin-repo-tools into feat-sonatype-api
2 parents c48ba17 + 2eba0f7 commit ef99046

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,23 @@ description: >
55
runs:
66
using: composite
77
steps:
8-
- name: Install AWS CLI
8+
- name: Install AWS CLI (Linux)
9+
if: runner.os == 'Linux'
910
shell: bash
1011
run: |
1112
sudo snap install aws-cli --classic
13+
- name: Install AWS CLI (macOS)
14+
if: runner.os == 'macOS'
15+
shell: bash
16+
run: |
17+
curl "https://awscli.amazonaws.com/AWSCLIV2.pkg" -o "AWSCLIV2.pkg"
18+
sudo installer -pkg AWSCLIV2.pkg -target /
19+
- name: Install AWS CLI (Windows)
20+
if: runner.os == 'Windows'
21+
shell: powershell
22+
run: |
23+
Invoke-WebRequest -Uri "https://awscli.amazonaws.com/AWSCLIV2.msi" -OutFile "AWSCLIV2.msi"
24+
Start-Process msiexec.exe -Wait -ArgumentList '/I AWSCLIV2.msi /quiet'
1225
- name: Set up kat
1326
shell: bash
1427
run: |

build-plugins/kmp-conventions/src/main/kotlin/aws/sdk/kotlin/gradle/kmp/ConfigureTargets.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ fun Project.configureKmpTargets() {
132132
kmpExt.apply { configureWindows() }
133133
}
134134
if ((hasLinux || hasDesktop) && (HostManager.hostIsLinux || NATIVE_ENABLE_ALL_TARGETS)) {
135-
if (group == "aws.sdk.kotlin.crt") { // TODO Remove special-casing once K/N is released across the entire project
135+
if (group == "aws.sdk.kotlin.crt" || group == "aws.smithy.kotlin") { // TODO Remove special-casing once K/N is released across the entire project
136136
kmpExt.apply { configureLinux() }
137137
} else {
138138
kmpExt.apply { configureDummyLinux() }

0 commit comments

Comments
 (0)