From 5da6e4ecb48364500b51cb6ddb1969c9a7ed5b65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Mon, 30 Sep 2024 14:27:25 +0200 Subject: [PATCH 01/12] Fix date format --- .github/workflows/auto-update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml index 2c71b62..77c5716 100644 --- a/.github/workflows/auto-update.yml +++ b/.github/workflows/auto-update.yml @@ -24,7 +24,7 @@ jobs: fetch-depth: 0 - name: Export publish version - run: echo "PUBLISH_VERSION=$(date +%Y.%M.%d)" >> $GITHUB_ENV + run: echo "PUBLISH_VERSION=$(date +%Y.%m.%d)" >> $GITHUB_ENV - name: Run the auto-update script run: | From 2be7a7ffe77d4396b8b925613edc91adcd277dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Mon, 30 Sep 2024 14:44:27 +0200 Subject: [PATCH 02/12] Dependency bumps 2024/09 --- .mill-version | 2 +- build.sc | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.mill-version b/.mill-version index af88ba8..bd0119f 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -0.11.1 +0.11.12 diff --git a/build.sc b/build.sc index 3614744..4a3a1f6 100644 --- a/build.sc +++ b/build.sc @@ -1,13 +1,13 @@ -import $ivy.`io.chris-kipp::mill-ci-release::0.1.9` -import $ivy.`software.amazon.smithy:smithy-model:1.27.1` -import $ivy.`software.amazon.smithy:smithy-rules-engine:1.27.1` -import $ivy.`software.amazon.smithy:smithy-build:1.27.1` -import software.amazon.smithy.aws.traits.protocols.AwsProtocolTrait -import $ivy.`software.amazon.smithy:smithy-aws-traits:1.27.1` -import $ivy.`software.amazon.smithy:smithy-aws-iam-traits:1.27.1` -import $ivy.`software.amazon.smithy:smithy-waiters:1.27.1` -import $ivy.`software.amazon.smithy:smithy-aws-cloudformation-traits:1.27.1` +import $ivy.`io.chris-kipp::mill-ci-release::0.1.10` +import $ivy.`software.amazon.smithy:smithy-model:1.51.0` +import $ivy.`software.amazon.smithy:smithy-rules-engine:1.51.0` +import $ivy.`software.amazon.smithy:smithy-build:1.51.0` +import $ivy.`software.amazon.smithy:smithy-aws-traits:1.51.0` +import $ivy.`software.amazon.smithy:smithy-aws-iam-traits:1.51.0` +import $ivy.`software.amazon.smithy:smithy-waiters:1.51.0` +import $ivy.`software.amazon.smithy:smithy-aws-cloudformation-traits:1.51.0` +import software.amazon.smithy.aws.traits.protocols.AwsProtocolTrait import mill.define.Sources import software.amazon.smithy.model.transform.ModelTransformer import software.amazon.smithy.model.shapes._ @@ -23,7 +23,7 @@ import scala.jdk.CollectionConverters._ import io.kipp.mill.ci.release.CiReleaseModule import io.kipp.mill.ci.release.SonatypeHost -val smithyVersion = "1.27.1" +val smithyVersion = "1.51.0" val org = "com.disneystreaming.smithy" def specFolder = From 4da52ba9ab5c175f7b131e228975c1421290caec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Mon, 30 Sep 2024 14:45:16 +0200 Subject: [PATCH 03/12] run publish from branch --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc323d2..ae28ec7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,7 @@ on: # branches: ["*"] push: # branches: ["main"] + branches: ["dependency-bumps"] tags: ["v*"] concurrency: From 76ec27872884a01027b47bcb5ad45736f20557e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Mon, 30 Sep 2024 14:48:11 +0200 Subject: [PATCH 04/12] publish unconditionally --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae28ec7..a216015 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: mill-version: ${{ env.MILL_VERSION }} - name: Publish ${{ github.ref }} - if: startsWith(github.ref, 'refs/tags/v') + # if: startsWith(github.ref, 'refs/tags/v') run: | mill -i __.publishArtifacts mill -i io.kipp.mill.ci.release.ReleaseModule/publishAll From 805fb7553b4010243a01f6ca7b7d2ca2c27197ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Mon, 30 Sep 2024 15:33:42 +0200 Subject: [PATCH 05/12] bump submodule --- aws-sdk-js-v3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-sdk-js-v3 b/aws-sdk-js-v3 index a8df138..dddd164 160000 --- a/aws-sdk-js-v3 +++ b/aws-sdk-js-v3 @@ -1 +1 @@ -Subproject commit a8df138d2c3e3c4afec385159802235781650ffb +Subproject commit dddd1640f55be2b08449d9a2e27ec485328d9e1a From 6f155208a7b084842744e6c7d796bc77c002bdf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Mon, 30 Sep 2024 15:37:27 +0200 Subject: [PATCH 06/12] Add smithy-aws-endpoints --- build.sc | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sc b/build.sc index 4a3a1f6..124f122 100644 --- a/build.sc +++ b/build.sc @@ -94,6 +94,7 @@ trait AWSSpec extends Cross.Module[String] with BaseModule { ivy"software.amazon.smithy:smithy-aws-traits:$smithyVersion", ivy"software.amazon.smithy:smithy-aws-cloudformation-traits:$smithyVersion", ivy"software.amazon.smithy:smithy-aws-iam-traits:$smithyVersion", + ivy"software.amazon.smithy:smithy-aws-endpoints:$smithyVersion", ivy"software.amazon.smithy:smithy-waiters:$smithyVersion" ) From 5d4ffef2f3ff22c3c5b75ddb1ea8a45be5d2bf89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Mon, 30 Sep 2024 15:45:38 +0200 Subject: [PATCH 07/12] Add missing traits --- build.sc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.sc b/build.sc index 124f122..aa332dc 100644 --- a/build.sc +++ b/build.sc @@ -4,8 +4,10 @@ import $ivy.`software.amazon.smithy:smithy-rules-engine:1.51.0` import $ivy.`software.amazon.smithy:smithy-build:1.51.0` import $ivy.`software.amazon.smithy:smithy-aws-traits:1.51.0` import $ivy.`software.amazon.smithy:smithy-aws-iam-traits:1.51.0` +import $ivy.`software.amazon.smithy:smithy-aws-endpoints:1.51.0` import $ivy.`software.amazon.smithy:smithy-waiters:1.51.0` import $ivy.`software.amazon.smithy:smithy-aws-cloudformation-traits:1.51.0` +import $ivy.`software.amazon.smithy:smithy-aws-smoke-test-model:1.51.0` import software.amazon.smithy.aws.traits.protocols.AwsProtocolTrait import mill.define.Sources @@ -94,8 +96,9 @@ trait AWSSpec extends Cross.Module[String] with BaseModule { ivy"software.amazon.smithy:smithy-aws-traits:$smithyVersion", ivy"software.amazon.smithy:smithy-aws-cloudformation-traits:$smithyVersion", ivy"software.amazon.smithy:smithy-aws-iam-traits:$smithyVersion", + ivy"software.amazon.smithy:smithy-waiters:$smithyVersion", ivy"software.amazon.smithy:smithy-aws-endpoints:$smithyVersion", - ivy"software.amazon.smithy:smithy-waiters:$smithyVersion" + ivy"software.amazon.smithy:smithy-aws-smoke-test-model:$smithyVersion" ) def writeForCheckIn() = T.task { From 9c1ce8391bd0b045f6ccd8f53bff64f0cac84ef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Mon, 30 Sep 2024 16:28:57 +0200 Subject: [PATCH 08/12] try again --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a216015..a8d1ad8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,6 @@ jobs: mill -i __.publishArtifacts mill -i io.kipp.mill.ci.release.ReleaseModule/publishAll env: - PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} PGP_SECRET: ${{ secrets.PGP_SECRET }} SONATYPE_PASSWORD: ${{ secrets.S01_SONATYPE_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.S01_SONATYPE_USERNAME }} From daefb1e9e03bda84e2a78cb857221a473697cfd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Mon, 30 Sep 2024 16:33:31 +0200 Subject: [PATCH 09/12] restore passphrase, resolve warnings --- .github/workflows/ci.yml | 1 + build.sc | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8d1ad8..a216015 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,6 +47,7 @@ jobs: mill -i __.publishArtifacts mill -i io.kipp.mill.ci.release.ReleaseModule/publishAll env: + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} PGP_SECRET: ${{ secrets.PGP_SECRET }} SONATYPE_PASSWORD: ${{ secrets.S01_SONATYPE_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.S01_SONATYPE_USERNAME }} diff --git a/build.sc b/build.sc index aa332dc..7a3ee58 100644 --- a/build.sc +++ b/build.sc @@ -72,7 +72,7 @@ object summary extends BaseModule { ) } - def resources: Sources = T.sources { + def resources: T[Seq[PathRef]] = T.sources { val target = T.dest / "summary.json" os.write.over(target, summaryJson(), createFolders = true) target @@ -170,7 +170,7 @@ trait AWSSpec extends Cross.Module[String] with BaseModule { map(Path.of(fullFileName)) } - override def resources: Sources = T.sources { + override def resources: T[Seq[PathRef]] = T.sources { val target = T.dest / "META-INF" / "smithy" / shortFileName val manifestTarget = T.dest / "META-INF" / "smithy" / "manifest" os.write.over(target, trimmedModel(), createFolders = true) From 755ce1dc21bf34cb4ecbcae05705312ea950a7f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Mon, 30 Sep 2024 16:35:21 +0200 Subject: [PATCH 10/12] set empty passphrase --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a216015..ac88337 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: mill -i __.publishArtifacts mill -i io.kipp.mill.ci.release.ReleaseModule/publishAll env: - PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} + PGP_PASSPHRASE: "" PGP_SECRET: ${{ secrets.PGP_SECRET }} SONATYPE_PASSWORD: ${{ secrets.S01_SONATYPE_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.S01_SONATYPE_USERNAME }} From e6c977891636770c5174879382332443a83e3032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Mon, 30 Sep 2024 17:05:58 +0200 Subject: [PATCH 11/12] Restore build in PRs, remove publish on non-tags --- .github/workflows/ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac88337..cf75d48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,11 +1,10 @@ name: Continuous Integration on: - # pull_request: - # branches: ["*"] + pull_request: + branches: ["*"] push: # branches: ["main"] - branches: ["dependency-bumps"] tags: ["v*"] concurrency: @@ -42,7 +41,7 @@ jobs: mill-version: ${{ env.MILL_VERSION }} - name: Publish ${{ github.ref }} - # if: startsWith(github.ref, 'refs/tags/v') + if: startsWith(github.ref, 'refs/tags/v') run: | mill -i __.publishArtifacts mill -i io.kipp.mill.ci.release.ReleaseModule/publishAll From 441a777ff7a230e5c2ea34918bf4d51ad1b4e98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Mon, 30 Sep 2024 17:10:18 +0200 Subject: [PATCH 12/12] Add some useful checking on PRs --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf75d48..ba134b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,6 +40,10 @@ jobs: with: mill-version: ${{ env.MILL_VERSION }} + - name: Build packages + run: | + mill -i __.jar + - name: Publish ${{ github.ref }} if: startsWith(github.ref, 'refs/tags/v') run: |