Skip to content

Commit 46ce318

Browse files
committed
feedback
1 parent 7c77b82 commit 46ce318

File tree

12 files changed

+7
-654
lines changed

12 files changed

+7
-654
lines changed

.github/actions/artifact-size-metrics/build-and-upload/action.yml renamed to .github/actions/artifact-size-metrics/calculate-and-upload/action.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,21 @@ description: Calculates size for JVM artifacts
44
inputs:
55
upload:
66
description: Whether the metrics should be uploaded to S3/Cloudwatch
7+
type: boolean
78
release_metrics:
89
description: Whether the metrics are coming from a release build
10+
type: boolean
911

1012
runs:
1113
using: composite
1214
steps:
13-
- name: Calculate artifact sizes
15+
- name: Calculate and upload artifact sizes
1416
shell: bash
1517
env:
1618
GITHUB_REPOSITORY: ${{ github.repository }}
1719
IDENTIFIER: ${{ github.ref_name }}
1820
UPLOAD: ${{ inputs.upload }}
1921
RELEASE_METRICS: ${{ inputs.release_metrics }}
2022
run: |
21-
chmod +x ../utils/build-and-upload/main.sh
22-
../utils/build-and-upload/main.sh
23+
chmod +x ../utils/calculate-and-upload/main.sh
24+
../utils/calculate-and-upload/main.sh

.github/actions/artifact-size-metrics/download-and-process/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ description: Compares artifact size metrics, leaves a comment, and fails if a si
44
inputs:
55
download:
66
description: Whether the artifact size metrics should be downloaded from S3
7+
type: boolean
78

89
runs:
910
using: composite

.github/actions/artifact-size-metrics/utils/build-and-upload/main.sh renamed to .github/actions/artifact-size-metrics/utils/calculate-and-upload/main.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Bash script to build, calculate, and upload artifact size metrics
3+
# Bash script to calculate, and upload artifact size metrics
44

55
source "$(dirname "$0")/calculate_metrics.sh"
66
source "$(dirname "$0")/cloudwatch.sh"
@@ -10,16 +10,6 @@ source "$(dirname "$0")/../setup.sh"
1010

1111
setup
1212

13-
# Build and move artifacts that'll be published to staging dir (build/m2)
14-
if [ "$GITHUB_REPOSITORY" = "aws-sdk-kotlin" ]; then
15-
# FIXME: Enable K/N builds
16-
./gradlew build -Paws.kotlin.native=false build --parallel --max-workers 16
17-
./gradlew -Paws.kotlin.native=false publish --parallel --max-workers 16
18-
else
19-
./gradlew build
20-
./gradlew publish --parallel --max-workers 16
21-
fi
22-
2313
# Calculate size for artifacts in staging dir (build/m2) and save them to metrics_file
2414
calculateArtifactSizes "$metrics_file" # see: constants.sh
2515

build-plugins/build-support/build.gradle.kts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,6 @@ dependencies {
2727
testImplementation(libs.kotlinx.coroutines.test)
2828
}
2929

30-
gradlePlugin {
31-
plugins {
32-
create("artifact-size-metrics") {
33-
id = "aws.sdk.kotlin.gradle.artifactsizemetrics"
34-
implementationClass = "aws.sdk.kotlin.gradle.plugins.artifactsizemetrics.ArtifactSizeMetricsPlugin"
35-
}
36-
}
37-
}
38-
3930
val generateKtlintVersion by tasks.registering {
4031
// generate the version of the runtime to use as a resource.
4132
// this keeps us from having to manually change version numbers in multiple places

build-plugins/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/plugins/artifactsizemetrics/AnalyzeArtifactSizeMetrics.kt

Lines changed: 0 additions & 209 deletions
This file was deleted.

0 commit comments

Comments
 (0)