From 6b6c35a6e30992038bf557790ee46afd7d68e746 Mon Sep 17 00:00:00 2001 From: Enno Runne <458526+ennru@users.noreply.github.com> Date: Mon, 11 Mar 2024 10:12:21 +0100 Subject: [PATCH] chore: bump GH actions; replace release drafter (#3142) --- .github/release-drafter.yml | 111 ------------------------- .github/release.yml | 100 ++++++++++++++++++++++ .github/workflows/check-build-test.yml | 55 +++++++----- .github/workflows/fossa.yml | 13 ++- .github/workflows/link-validator.yml | 16 ++-- .github/workflows/publish.yml | 22 +++-- .github/workflows/release-drafter.yml | 23 ----- CODE_OF_CONDUCT.md | 10 --- README.md | 4 +- docs/release-train-issue-template.md | 1 - project/plugins.sbt | 4 +- 11 files changed, 176 insertions(+), 183 deletions(-) delete mode 100644 .github/release-drafter.yml create mode 100644 .github/release.yml delete mode 100644 .github/workflows/release-drafter.yml delete mode 100644 CODE_OF_CONDUCT.md diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml deleted file mode 100644 index 8e0b54bc0b..0000000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,111 +0,0 @@ -# Config for https://github.com/toolmantim/release-drafter -name-template: 'Alpakka $NEXT_PATCH_VERSION' -tag-template: 'v$NEXT_PATCH_VERSION' -categories: - - title: ':toolbox: Infrastructure' - label: 'alpakka-itself' - - title: 'AMQP' - label: 'p:amqp' - - title: 'Apache Solr' - label: 'p:solr' - - title: 'Apache HDFS' - label: 'p:hdfs' - - title: 'Apache Kudu' - label: 'p:kudu' - - title: 'AvroParquet' - label: 'p:avroparquet' - - title: 'AWS EventBridge' - label: 'p:aws-event-bridge' - - title: 'AWS Lambda' - label: 'p:aws-lambda' - - title: 'AWS Kinesis' - label: 'p:kinesis' - - title: 'AWS S3' - label: 'p:aws-s3' - - title: 'AWS SNS' - label: 'p:aws-sns' - - title: 'AWS SQS' - label: 'p:aws-sqs' - - title: 'Azure Storage Queue' - label: 'p:azure-storage-queue' - - title: 'Cassandra' - label: 'p:cassandra' - - title: 'Comma-separated Values (CSV)' - label: 'p:csv' - - title: 'Couchbase' - label: 'p:couchbase' - - title: 'Dynamo DB' - label: 'p:dynamodb' - - title: 'Elasticsearch' - label: 'p:elasticsearch' - - title: 'File' - label: 'p:file' - - title: 'FTP' - label: 'p:ftp' - - title: 'Geode' - label: 'p:geode' - - title: 'Google Cloud BigQuery' - label: 'p:google-cloud-bigquery' - - title: 'Google Cloud BigQuery Storage' - label: 'p:google-cloud-bigquery-storage' - - title: 'Google Cloud Pub/Sub' - label: 'p:google-cloud-pub-sub' - - title: 'Google Cloud Pub/Sub gRPC' - label: 'p:google-cloud-pub-sub-grpc' - - title: 'Google Cloud Storage' - label: 'p:google-cloud-storage' - - title: 'Google FCM (Firebase)' - label: 'p:google-fcm' - - title: 'HBase' - label: 'p:hbase' - - title: 'Huawei Push Kit' - label: 'p:huawei-push-kit' - - title: 'InfluxDB' - label: 'p:influxdb' - - title: 'IronMQ' - label: 'p:ironmq' - - title: 'JDBC' - label: 'p:jdbc' - - title: 'JMS' - label: 'p:jms' - - title: 'Json streaming' - label: 'p:json-streaming' - - title: 'MongoDB' - label: 'p:mongodb' - - title: 'MQTT' - label: 'p:mqtt' - - title: 'MQTT Streaming' - label: 'p:mqtt-streaming' - - title: 'OrientDB' - label: 'p:orientdb' - - title: 'Pravega' - label: 'p:pravega' - - title: 'Reference' - label: 'p:reference' - - title: 'Server-sent events (SSE)' - label: 'p:sse' - - title: 'Simple Codecs' - label: 'p:recordio' - - title: 'Slick' - label: 'p:slick' - - title: 'Spring Web' - label: 'p:spring-web' - - title: 'Text' - label: 'p:text' - - title: 'UDP' - label: 'p:udp' - - title: 'Unix Domain Socket' - label: 'p:unix-domain-socket' - - title: 'XML' - label: 'p:xml' - -change-template: '- $TITLE [#$NUMBER](https://github.com/akka/alpakka/issues/$NUMBER) by [@$AUTHOR](https://github.com/$AUTHOR)' -template: | - # :mega: Alpakka $NEXT_PATCH_VERSION released! - - ## Changes - - $CHANGES - - ## :bow: Credits - Special thanks to the following contributors who helped with this release: $CONTRIBUTORS diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 0000000000..0696e057fe --- /dev/null +++ b/.github/release.yml @@ -0,0 +1,100 @@ +# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuring-automatically-generated-release-notes +changelog: + categories: + - title: 'AMQP' + labels: 'p:amqp' + - title: 'Apache Solr' + labels: 'p:solr' + - title: 'Apache HDFS' + labels: 'p:hdfs' + - title: 'Apache Kudu' + labels: 'p:kudu' + - title: 'AvroParquet' + labels: 'p:avroparquet' + - title: 'AWS EventBridge' + labels: 'p:aws-event-bridge' + - title: 'AWS Lambda' + labels: 'p:aws-lambda' + - title: 'AWS Kinesis' + labels: 'p:kinesis' + - title: 'AWS S3' + labels: 'p:aws-s3' + - title: 'AWS SNS' + labels: 'p:aws-sns' + - title: 'AWS SQS' + labels: 'p:aws-sqs' + - title: 'Azure Storage Queue' + labels: 'p:azure-storage-queue' + - title: 'Cassandra' + labels: 'p:cassandra' + - title: 'Comma-separated Values (CSV)' + labels: 'p:csv' + - title: 'Couchbase' + labels: 'p:couchbase' + - title: 'Dynamo DB' + labels: 'p:dynamodb' + - title: 'Elasticsearch' + labels: 'p:elasticsearch' + - title: 'File' + labels: 'p:file' + - title: 'FTP' + labels: 'p:ftp' + - title: 'Geode' + labels: 'p:geode' + - title: 'Google Cloud BigQuery' + labels: 'p:google-cloud-bigquery' + - title: 'Google Cloud BigQuery Storage' + labels: 'p:google-cloud-bigquery-storage' + - title: 'Google Cloud Pub/Sub' + labels: 'p:google-cloud-pub-sub' + - title: 'Google Cloud Pub/Sub gRPC' + labels: 'p:google-cloud-pub-sub-grpc' + - title: 'Google Cloud Storage' + labels: 'p:google-cloud-storage' + - title: 'Google FCM (Firebase)' + labels: 'p:google-fcm' + - title: 'HBase' + labels: 'p:hbase' + - title: 'Huawei Push Kit' + labels: 'p:huawei-push-kit' + - title: 'InfluxDB' + labels: 'p:influxdb' + - title: 'IronMQ' + labels: 'p:ironmq' + - title: 'JDBC' + labels: 'p:jdbc' + - title: 'JMS' + labels: 'p:jms' + - title: 'Json streaming' + labels: 'p:json-streaming' + - title: 'MongoDB' + labels: 'p:mongodb' + - title: 'MQTT' + labels: 'p:mqtt' + - title: 'MQTT Streaming' + labels: 'p:mqtt-streaming' + - title: 'OrientDB' + labels: 'p:orientdb' + - title: 'Pravega' + labels: 'p:pravega' + - title: 'Reference' + labels: 'p:reference' + - title: 'Server-sent events (SSE)' + labels: 'p:sse' + - title: 'Simple Codecs' + labels: 'p:recordio' + - title: 'Slick' + labels: 'p:slick' + - title: 'Spring Web' + labels: 'p:spring-web' + - title: 'Text' + labels: 'p:text' + - title: 'UDP' + labels: 'p:udp' + - title: 'Unix Domain Socket' + labels: 'p:unix-domain-socket' + - title: 'XML' + labels: 'p:xml' + - title: Other Changes + labels: + - "*" diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml index 1a8ee1a197..089ee0ad56 100644 --- a/.github/workflows/check-build-test.yml +++ b/.github/workflows/check-build-test.yml @@ -25,21 +25,25 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3.1.0 + # https://github.com/actions/checkout/releases + # v4.1.1 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: # https://github.com/olafurpg/setup-scala#faster-checkout-of-big-repos fetch-depth: 100 + fetch-tags: true - - name: Fetch tags - run: git fetch --depth=100 origin +refs/tags/*:refs/tags/* + - name: Cache Coursier cache + # https://github.com/coursier/cache-action/releases + # v6.4.5 + uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d - name: Set up JDK 11 - uses: coursier/setup-action@v1.3.0 + # https://github.com/coursier/setup-action/releases + # v1.3.5 + uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f with: jvm: temurin:1.11 - - name: Cache Coursier cache - uses: coursier/cache-action@v6.4.0 - - name: "Code style, compile tests, MiMa. Run locally with: sbt \"verifyCodeStyle; +Test/compile; mimaReportBinaryIssues\"" run: sbt "verifyCodeStyle; +Test/compile; mimaReportBinaryIssues" @@ -51,21 +55,25 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3.1.0 + # https://github.com/actions/checkout/releases + # v4.1.1 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: # https://github.com/olafurpg/setup-scala#faster-checkout-of-big-repos fetch-depth: 100 + fetch-tags: true - - name: Fetch tags - run: git fetch --depth=100 origin +refs/tags/*:refs/tags/* + - name: Cache Coursier cache + # https://github.com/coursier/cache-action/releases + # v6.4.5 + uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d - name: Set up JDK 11 - uses: coursier/setup-action@v1.3.0 + # https://github.com/coursier/setup-action/releases + # v1.3.5 + uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f with: jvm: temurin:1.11 - - name: Cache Coursier cache - uses: coursier/cache-action@v6.4.0 - - name: "Create all API docs and create site with Paradox" run: sbt docs/makeSite @@ -134,25 +142,32 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3.1.0 + # https://github.com/actions/checkout/releases + # v4.1.1 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: # gh-detect-changes.sh compares with the target branch fetch-depth: 0 + fetch-tags: true - name: Detect changes in Alpakka ${{ matrix.connector }} env: CONNECTOR: ${{ matrix.connector }} run: ./scripts/gh-detect-changes.sh "${CONNECTOR}" + - name: Cache Coursier cache + if: env.execute_build == 'true' + # https://github.com/coursier/cache-action/releases + # v6.4.5 + uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d + - name: Set up JDK 11 if: env.execute_build == 'true' - uses: coursier/setup-action@v1.3.0 + # https://github.com/coursier/setup-action/releases + # v1.3.5 + uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f with: jvm: temurin:1.11 - - name: Cache Coursier cache - if: env.execute_build == 'true' - uses: coursier/cache-action@v6.4.0 - - name: ${{ matrix.connector }} if: env.execute_build == 'true' env: diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml index cdb910314e..b64878faba 100644 --- a/.github/workflows/fossa.yml +++ b/.github/workflows/fossa.yml @@ -15,16 +15,23 @@ jobs: if: github.repository == 'akka/alpakka' steps: - name: Checkout - uses: actions/checkout@v3.1.0 + # https://github.com/actions/checkout/releases + # v4.1.1 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves fetch-depth: 0 + fetch-tags: true - name: Cache Coursier cache - uses: coursier/cache-action@v6.4.0 + # https://github.com/coursier/cache-action/releases + # v6.4.5 + uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d - name: Set up JDK 17 - uses: coursier/setup-action@v1.3.0 + # https://github.com/coursier/setup-action/releases + # v1.3.5 + uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f with: jvm: temurin:1.17 diff --git a/.github/workflows/link-validator.yml b/.github/workflows/link-validator.yml index a47c28133c..ba44a571ba 100644 --- a/.github/workflows/link-validator.yml +++ b/.github/workflows/link-validator.yml @@ -13,18 +13,22 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v3.1.0 + # https://github.com/actions/checkout/releases + # v4.1.1 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: # https://github.com/olafurpg/setup-scala#faster-checkout-of-big-repos fetch-depth: 100 - - - name: Fetch tags - run: git fetch --depth=100 origin +refs/tags/*:refs/tags/* + fetch-tags: true - name: Cache Coursier cache - uses: coursier/cache-action@v6.4.0 + # https://github.com/coursier/cache-action/releases + # v6.4.5 + uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d - name: Set up JDK 11 - uses: coursier/setup-action@v1.3.0 + # https://github.com/coursier/setup-action/releases + # v1.3.5 + uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f with: jvm: temurin:1.11 apps: cs diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2294a9fe09..70b5ed1ff0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,16 +21,23 @@ jobs: JAVA_OPTS: -Xms2G -Xmx2G -Xss2M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8 steps: - name: Checkout - uses: actions/checkout@v3.1.0 + # https://github.com/actions/checkout/releases + # v4.1.1 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves fetch-depth: 0 + fetch-tags: true - name: Cache Coursier cache - uses: coursier/cache-action@v6.4.0 + # https://github.com/coursier/cache-action/releases + # v6.4.5 + uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d - name: Set up JDK 11 - uses: coursier/setup-action@v1.3.0 + # https://github.com/coursier/setup-action/releases + # v1.3.5 + uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f with: jvm: temurin:1.11.0.17 @@ -48,13 +55,18 @@ jobs: if: github.event.repository.fork == false steps: - name: Checkout - uses: actions/checkout@v3.1.0 + # https://github.com/actions/checkout/releases + # v4.1.1 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves fetch-depth: 0 + fetch-tags: true - name: Set up JDK 11 - uses: coursier/setup-action@v1.3.0 + # https://github.com/coursier/setup-action/releases + # v1.3.5 + uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f with: jvm: temurin:1.11 diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml deleted file mode 100644 index e3fd7a6fb8..0000000000 --- a/.github/workflows/release-drafter.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Release Drafter - -on: - push: - branches: - - main - - release-* - -permissions: - contents: read - -jobs: - update_release_draft: - runs-on: ubuntu-22.04 - permissions: - contents: write - steps: - # Drafts your next Release notes as Pull Requests are merged - # https://github.com/release-drafter/release-drafter/releases - # v5.21.1 - - uses: release-drafter/release-drafter@6df64e4ba4842c203c604c1f45246c5863410adb - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index 372fcb5886..0000000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,10 +0,0 @@ -All repositories in these organizations: - -* [lightbend](https://github.com/lightbend) -* [akka](https://github.com/akka) -* [lagom](https://github.com/lagom) -* [playframework](https://github.com/playframework) -* [sbt](https://github.com/sbt) -* [slick](https://github.com/slick) - -are covered by the Lightbend Community Code of Conduct: https://www.lightbend.com/conduct diff --git a/README.md b/README.md index ea48cd6d8a..110fd4a121 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ Systems don't come alone. In the modern world of microservices and cloud deploym The Alpakka project implements stream-aware & reactive integration pipelines for Java and Scala. It is built on top of [Akka Streams](https://doc.akka.io/docs/akka/current/stream/index.html), and has been designed from the ground up to understand streaming natively and provide a DSL for reactive and stream-oriented programming, with built-in support for backpressure. Akka Streams is a [Reactive Streams](http://www.reactive-streams.org/) and JDK 9+ [java.util.concurrent.Flow](https://docs.oracle.com/javase/10/docs/api/java/util/concurrent/Flow.html)-compliant implementation and therefore [fully interoperable](https://doc.akka.io/docs/akka/current/general/stream/stream-design.html#interoperation-with-other-reactive-streams-implementations) with other implementations. +The Akka family of projects is managed by teams at [Lightbend](https://lightbend.com) with help from the community. Documentation ------------- @@ -27,7 +28,6 @@ Community You can join these forums and chats to discuss and ask Akka and Alpakka related questions: - Forums: [discuss.lightbend.com](https://discuss.lightbend.com/c/akka/streams-and-alpakka) -- Chat room about *using* Akka and Alpakka: [![gitter: akka/akka](https://img.shields.io/badge/gitter%3A-akka%2Fakka-blue.svg?style=flat-square)](https://gitter.im/akka/akka) - Issue tracker: [![github: akka/alpakka](https://img.shields.io/badge/github%3A-issues-blue.svg?style=flat-square)](https://github.com/akka/alpakka/issues) In addition to that, you may enjoy the following: @@ -61,4 +61,4 @@ Our goal is to improve the stability and test coverage for Alpakka APIs over tim License ------- -Alpakka is licensed under the Business Source License 1.1, see [LICENSE](https://github.com/akka/alpakka/blob/main/LICENSE). +Alpakka is licensed under the [Business Source License (BSL) 1.1](https://github.com/akka/alpakka/blob/main/LICENSE), please see the [Akka License FAQ](https://www.lightbend.com/akka/license-faq). diff --git a/docs/release-train-issue-template.md b/docs/release-train-issue-template.md index 73bfde4d7d..d31d2450ed 100644 --- a/docs/release-train-issue-template.md +++ b/docs/release-train-issue-template.md @@ -61,7 +61,6 @@ For minor or major releases: ### Afterwards - [ ] If Cassandra has relevant changes, create/update PR in [Akka Persistence Cassandra](https://github.com/akka/akka-persistence-cassandra/) to upgrade to $VERSION$ -- [ ] Update version for [Lightbend Supported Modules](https://developer.lightbend.com/docs/lightbend-platform/introduction/getting-help/build-dependencies.html) in [private project](https://github.com/lightbend/lightbend-technology-intro-doc/blob/master/docs/modules/getting-help/examples/build.sbt) - [ ] Update [akka-dependencies bom](https://github.com/lightbend/akka-dependencies) - [ ] Create an issue or PR to upgrade projects in [Alpakka Samples](https://github.com/akka/alpakka-samples) - Close this issue diff --git a/project/plugins.sbt b/project/plugins.sbt index 20375818c8..3417323b80 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,10 +5,10 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") // discipline addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.2") +addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") // docs -addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.54") +addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.55") addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-dependencies" % "0.2.4") addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.3") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")