Skip to content

Commit

Permalink
Merge branch 'master' into upgrade-akka-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim-Linschoten authored Oct 1, 2024
2 parents f239f82 + 9cbf791 commit 3605410
Show file tree
Hide file tree
Showing 29 changed files with 447 additions and 1,673 deletions.
36 changes: 36 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name-template: 'v$RESOLVED_VERSION'
tag-template: 'v$RESOLVED_VERSION'
categories:
- title: '🚀 Features'
labels:
- 'feature'
- 'enhancement'
- title: '🐛 Bug Fixes'
labels:
- 'fix'
- 'bugfix'
- 'bug'
- title: '🧰 Maintenance'
labels:
- 'chore'
- 'dependency'
- 'dependencies'
exclude-labels:
- 'skip-changelog'
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
version-resolver:
major:
labels:
- 'major'
minor:
labels:
- 'minor'
patch:
labels:
- 'patch'
default: patch
template: |
## Changes
$CHANGES
774 changes: 0 additions & 774 deletions .github/workflows/baker.XanitizerConfig

This file was deleted.

117 changes: 117 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
name: CI
on:
push:
branches: ["*"]
tags: ["v*"]

permissions:
contents: read

jobs:
ci:
name: Build and test
permissions:
contents: write
pull-requests: write
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
cache: sbt
- name: Run tests and coverage
run: |-
cp .jvmopts-ci .jvmopts
sbt coverage test coverageReport && bash <(curl -s https://codecov.io/bash)
- name: Prepare draft release notes
# Run this step only for pushes to the master branch or for tags starting with 'v'
if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')) }}
continue-on-error: true
uses: release-drafter/release-drafter@v6
with:
config-name: release-drafter.yml
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
publish-sonatype:
permissions:
contents: write
pull-requests: write
name: Publish to Sonatype
# Publish to Sonatype only on tags starting with 'v' (stable releases) and not from forked repositories
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && ! github.event.repository.fork }}
needs: [ci]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
cache: sbt
- name: Publish to Sonatype
run: sbt ci-release
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
PGP_SECRET: ${{ secrets.PGP_SECRET }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
publish-azure:
permissions:
contents: write
pull-requests: write
name: Publish to Azure
# Publish to Azure only for non-tag references (e.g., all the pushes to default and other branches) and not from forked repositories
if: ${{ ! startsWith(github.ref, 'refs/tags/') && ! github.event.repository.fork }}
needs: [ci]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
cache: sbt
- name: Publish to Azure
run: sbt "clean; +aetherDeploy; project interaction-example-make-payment-and-ship-items; +aetherDeploy; project interaction-example-reserve-items; +aetherDeploy; project bakery-client-example; +aetherDeploy; project bakery-kafka-listener-example; +aetherDeploy"
env:
AZURE_FEEDUSER: ${{ secrets.AZURE_FEEDUSER }}
AZURE_FEEDPASSWORD: ${{ secrets.AZURE_FEEDPASSWORD }}
AZURE_FEEDURL: ${{ secrets.AZURE_FEEDURL }}
dependency-submission:
name: Submit dependency graph
continue-on-error: true
needs: [ci]
# run on 1) master branch
# do not run on pull requests
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/master'
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
cache: sbt
- name: Submit dependency graph
uses: scalacenter/sbt-dependency-submission@v2

41 changes: 41 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Release
on:
workflow_dispatch:
inputs:
release_tag:
description: 'Please specify the release version. i.e. v1.0.0 (must start with "v") with an optional suffix like -RC1'
required: true
type: string

permissions:
contents: read

jobs:
release:
name: Release
permissions:
contents: write
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.PAT_GIT_TAG_PUSH }}

- name: Check release tag format
run: |
if [[ ! "${{ inputs.release_tag }}" =~ ^v[0-9]+(\.[0-9]+)*(-[A-Za-z0-9]+)?$ ]]; then
echo "Error: release_tag must start with 'v' followed by a version number i.e. v4.1.0, optionally with a suffix like -RC1."
exit 1
fi
- name: Set Git user name and email
run: |
git config --global user.name "${{ github.actor }}"
git config --global user.email "${{ github.actor }}@users.noreply.github.com"
- name: Create release tag and push (triggers the CI run)
run: |-
git tag ${{ inputs.release_tag }} -m "${{ inputs.release_tag }}"
git push origin ${{ inputs.release_tag }}
40 changes: 0 additions & 40 deletions .github/workflows/security.yml

This file was deleted.

13 changes: 13 additions & 0 deletions .jvmopts-ci
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This is used to configure the sbt instance in CI

-XX:+UseG1GC
-Xms3G
-Xmx3G
-Xss2M
-XX:+AlwaysActAsServerClassMachine
-XX:ReservedCodeCacheSize=256m
-XX:MaxGCPauseMillis=750
-XX:+UseCompressedOops
-XX:MetaspaceSize=512M
-XX:-ClassUnloadingWithConcurrentMark
-Djava.security.egd=file:/dev/./urandom
7 changes: 4 additions & 3 deletions .scala-steward.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# PRs are created only again after 7 days since the last PR has passed
pullRequests.frequency = "7 days"
# Add custom labels to PRs to be used by the automated release process
pullRequests.customLabels = [ "dependency" ]
# group all patches, and typelevel updates
pullRequests.grouping = [
{ name = "patches", "title" = "Patch updates", "filter" = [{"version" = "patch"}] },
Expand All @@ -9,14 +11,13 @@ pullRequests.grouping = [
updates.pin = [
{ groupId = "org.typelevel", artifactId = "cats-effect", version = "2." },
{ groupId = "co.fs2", version = "2." },
{ groupId = "org.http4s", version = "0.22." },
{ groupId = "com.github.fd4s", artifactId = "fs2-kafka", version = "1."},
{ groupId = "com.github.cb372", artifactId = "cats-retry", version = "2."},
{ groupId = "org.scala-graph", version = "1."}
]

# ignore kotlin compiler version updates and http4s updates for cats-effect 3.x compatible versions
# ignore kotlin compiler version updates
updates.ignore = [
{ groupId = "org.http4s", version = "0.23." },
{ groupId = "org.http4s", version = "1." },
{ groupId = "org.jetbrains.kotlin" }
]
Loading

0 comments on commit 3605410

Please sign in to comment.