Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency bumps 2024/09, fix version format #11

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
2 changes: 1 addition & 1 deletion .github/workflows/auto-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Continuous Integration

on:
# pull_request:
# branches: ["*"]
pull_request:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thought: this meant PRs wouldn't have any CI whatsoever, seems to be by omission.

branches: ["*"]
push:
# branches: ["main"]
tags: ["v*"]
Expand Down Expand Up @@ -40,13 +40,17 @@ jobs:
with:
mill-version: ${{ env.MILL_VERSION }}

- name: Build packages
run: |
mill -i __.jar

Comment on lines +43 to +46
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thought: seems to be the closest thing to package in sbt. Just compiling didn't discover the issues with missing traits because we need to run resources, at the very least.

- name: Publish ${{ github.ref }}
if: startsWith(github.ref, 'refs/tags/v')
run: |
mill -i __.publishArtifacts
mill -i io.kipp.mill.ci.release.ReleaseModule/publishAll
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
PGP_PASSPHRASE: ""
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thought: the new key doesn't have a passphrase (generated in-browser on https://typelevel.org/sbt-typelevel/secrets.html)

PGP_SECRET: ${{ secrets.PGP_SECRET }}
SONATYPE_PASSWORD: ${{ secrets.S01_SONATYPE_PASSWORD }}
SONATYPE_USERNAME: ${{ secrets.S01_SONATYPE_USERNAME }}
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.11.1
0.11.12
2 changes: 1 addition & 1 deletion aws-sdk-js-v3
30 changes: 17 additions & 13 deletions build.sc
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
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-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
import software.amazon.smithy.model.transform.ModelTransformer
import software.amazon.smithy.model.shapes._
Expand All @@ -23,7 +25,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 =
Expand Down Expand Up @@ -70,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
Expand All @@ -94,7 +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-waiters:$smithyVersion",
ivy"software.amazon.smithy:smithy-aws-endpoints:$smithyVersion",
ivy"software.amazon.smithy:smithy-aws-smoke-test-model:$smithyVersion"
)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: what are we doing about those? #9 (comment)


def writeForCheckIn() = T.task {
Expand Down Expand Up @@ -166,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)
Expand Down
Loading