Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: akka/akka-http
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v10.6.0
Choose a base ref
...
head repository: akka/akka-http
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Loading
Showing 1,212 changed files with 11,176 additions and 2,626 deletions.
4 changes: 2 additions & 2 deletions .algolia-search-index-config.json
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"index_name": "akka_http_docs",
"start_urls": [
{
"url": "https://doc.akka.io/docs/akka-http/current/",
"url": "https://doc.akka.io/libraries/akka-http/current/",
"extra_attributes": {
"language": [
"scala",
@@ -41,4 +41,4 @@
"299459375"
],
"nb_hits": 1650
}
}
5 changes: 5 additions & 0 deletions .fossa.yml
Original file line number Diff line number Diff line change
@@ -4,5 +4,10 @@ version: 3
paths:
# exclude non-distributed projects from dependency scanning
exclude:
- akka-http2-tests
- akka-http-bench-jmh
- akka-http-compatibility-tests
- akka-http-scalafix
- akka-http-tests
- native-image-tests
- samples
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/---question.md
Original file line number Diff line number Diff line change
@@ -4,4 +4,4 @@ about: Please use https://discuss.akka.io for questions

---

Please use https://discuss.akka.io or https://gitter.im/akka/akka for questions instead of posting them to the issue tracker.
Please use https://discuss.akka.io for questions instead of posting them to the issue tracker.
4 changes: 3 additions & 1 deletion .github/workflows/algolia-doc-site-scrape.yml
Original file line number Diff line number Diff line change
@@ -16,7 +16,9 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v3.1.0
# https://github.com/actions/checkout/releases
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
fetch-depth: 0

83 changes: 83 additions & 0 deletions .github/workflows/check-samples.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: Check samples

on:
push:
branches:
- main
workflow_dispatch:

concurrency:
# Only run once for latest commit per ref and cancel other (previous) runs.
group: ci-${{ github.ref }}
cancel-in-progress: true

permissions:
contents: read

jobs:
check-samples:
name: Check Sample Projects
runs-on: ubuntu-22.04
steps:
- name: Checkout
# https://github.com/actions/checkout/releases
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
fetch-depth: 0

- name: Checkout GitHub merge
if: github.event.pull_request
run: |-
git fetch origin pull/${{ github.event.pull_request.number }}/merge:scratch
git checkout scratch
- name: Cache Coursier cache
# https://github.com/coursier/cache-action/releases
# v6.4.5
uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d

- name: Set up JDK 17
# https://github.com/coursier/setup-action/releases
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: temurin:1.17

- name: Gather version
# some cleanup of the sbt output to get the version sbt will use when publishing below
run: |-
sbt --no-colors "print akka-http/version" | tail -n 1 | tr -d '\n' > ~/.version
echo [$(cat ~/.version)]
# useful for debugging: hexdump -c ~/.version
- name: Publish artifacts locally
run: |-
sbt "+publishLocal; publishM2"
- name: Test akka-http-quickstart-java
run: |-
cd samples/akka-http-quickstart-java
mvn test -nsu -ntp -Dakka-http.version=`cat ~/.version`
- name: Test akka-http-quickstart-scala
run: |-
cd samples/akka-http-quickstart-scala
sbt "++2.13.15!; test;" -Dakka-http.version=`cat ~/.version`
sbt "clean; test;" -Dakka-http.version=`cat ~/.version`
- name: Email on failure
if: ${{ failure() }}
uses: dawidd6/action-send-mail@6063705cefe50cb915fc53bb06d4049cae2953b2
with:
server_address: smtp.gmail.com
server_port: 465
secure: true
username: ${{secrets.MAIL_USERNAME}}
password: ${{secrets.MAIL_PASSWORD}}
subject: "Failed: ${{ github.workflow }} / ${{ github.job }}"
to: ${{secrets.MAIL_SEND_TO}}
from: Akka CI
body: |
Job ${{ github.job }} in workflow ${{ github.workflow }} of ${{github.repository}} failed!
https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
12 changes: 9 additions & 3 deletions .github/workflows/fossa.yml
Original file line number Diff line number Diff line change
@@ -15,16 +15,22 @@ jobs:
if: github.repository == 'akka/akka-http'
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

- 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 temurin:1.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

42 changes: 42 additions & 0 deletions .github/workflows/link-validator.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Link Validator

on:
pull_request:
workflow_dispatch:
schedule:
- cron: '0 6 * * 1'

permissions:
contents: read

jobs:
validate-links:
runs-on: ubuntu-22.04
if: github.event.repository.fork == false
steps:
- name: Checkout
# 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: Cache Coursier cache
# https://github.com/coursier/cache-action/releases
# v6.4.5
uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d

- name: Set up JDK 11
# https://github.com/coursier/setup-action/releases
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: temurin:1.11
apps: cs

- name: sbt site
run: sbt docs/paradox

- name: Run Link Validator
run: cs launch net.runne::site-link-validator:0.2.5 -- scripts/link-validator.conf
73 changes: 73 additions & 0 deletions .github/workflows/native-image-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: Native Image Tests

on:
schedule:
- cron: "0 0 * * *"
workflow_dispatch:

permissions:
contents: read

jobs:
native-image-tests:
name: Run Native Image Tests
runs-on: ubuntu-22.04
steps:
- name: Checkout
# https://github.com/actions/checkout/releases
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
fetch-depth: 0

- name: Checkout GitHub merge
if: github.event.pull_request
run: |-
git fetch origin pull/${{ github.event.pull_request.number }}/merge:scratch
git checkout scratch
- name: Cache Coursier cache
# https://github.com/coursier/cache-action/releases
# v6.4.5
uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d

- name: Set up JDK 11
# https://github.com/coursier/setup-action/releases
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: temurin:1.11

- name: Gather version
# some cleanup of the sbt output to get the version sbt will use when publishing below
run: |-
sbt "akka-http-core/version" --batch --no-colors | tail -n 1 | cut -f 2 -d ' ' | tr -d '\n' > ~/.version
echo [$(cat ~/.version)]
# useful for debugging: hexdump -c ~/.version
- name: Publish artifacts locally
run: |-
sbt "publishLocal"
- name: Akka HTTP native image test app build
run: |-
cd native-image-tests/
sbt nativeImage -Dakka.http.version=`cat ~/.version`
# run the binary
target/native-image/native-image-tests
- name: Email on failure
if: ${{ failure() }}
uses: dawidd6/action-send-mail@6063705cefe50cb915fc53bb06d4049cae2953b2
with:
server_address: smtp.gmail.com
server_port: 465
secure: true
username: ${{secrets.MAIL_USERNAME}}
password: ${{secrets.MAIL_PASSWORD}}
subject: "Failed: ${{ github.workflow }} / ${{ github.job }}"
to: ${{secrets.MAIL_SEND_TO}}
from: Akka CI
body: |
Job ${{ github.job }} in workflow ${{ github.workflow }} of ${{github.repository}} failed!
https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
25 changes: 17 additions & 8 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Nightly Builds
name: Weekly Builds

on:
schedule:
- cron: "0 2 * * *"
- cron: "0 2 * * 2"
workflow_dispatch:

permissions:
@@ -16,27 +16,36 @@ jobs:
fail-fast: false
matrix:
SCALA_VERSION: [2.13, 3.3]
JDK_VERSION: ["1.11", "1.17"]
JDK_VERSION: ["1.11", "1.17", "1.21"]
include:
- JDK_VERSION: 1.11
JVM_NAME: temurin:1.11
extraOpts: ''
- JDK_VERSION: 1.17
JVM_NAME: temurin:1.17
extraOpts: ''
AKKA_VERSION: [main, default]
- JDK_VERSION: 1.21
JVM_NAME: temurin:1.21.0.2
extraOpts: ''
AKKA_VERSION: [main, default, snapshot]

steps:
- name: Checkout
uses: actions/checkout@v3.1.0
# https://github.com/actions/checkout/releases
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
fetch-depth: 0

- 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 ${{ matrix.JDK_VERSION }}
uses: coursier/setup-action@v1.3.0
# https://github.com/coursier/setup-action/releases
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: ${{ matrix.JVM_NAME }}

@@ -59,7 +68,7 @@ jobs:
test ${{ matrix.extraOpts }}
- name: Upload test results
uses: actions/upload-artifact@v3.1.1
uses: actions/upload-artifact@v4.6.0
if: success() || failure() # run this step even if previous step failed
with:
name: 'test-results-${{ matrix.JDK_VERSION }}-${{ matrix.SCALA_VERSION }}-${{ matrix.AKKA_VERSION }}'
63 changes: 63 additions & 0 deletions .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: Publish docs

on:
push:
branches:
- main
# for testing the GH Action without merging to main,
# in some cases
- test-publish-snapshots
- docs/v*
tags: ["*"]
workflow_dispatch:

permissions:
contents: read

jobs:
documentation:
name: Documentation
runs-on: ubuntu-22.04
if: github.repository == 'akka/akka-http'
steps:
- name: Checkout
# 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

- name: Set up JDK 11
# https://github.com/coursier/setup-action/releases
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: temurin:1.11

- name: Publish
run: |-
scripts/prepare-downloads.sh
eval "$(ssh-agent -s)"
echo $AKKA_RSYNC_GUSTAV | base64 -d > .github/id_rsa
chmod 600 .github/id_rsa
ssh-add .github/id_rsa
sbt -Dakka.genjavadoc.enabled=true publishRsync
env:
AKKA_RSYNC_GUSTAV: ${{ secrets.AKKA_RSYNC_GUSTAV }}

- name: Email on failure
if: ${{ failure() }}
uses: dawidd6/action-send-mail@6063705cefe50cb915fc53bb06d4049cae2953b2
with:
server_address: smtp.gmail.com
server_port: 465
secure: true
username: ${{secrets.MAIL_USERNAME}}
password: ${{secrets.MAIL_PASSWORD}}
subject: "Failed: ${{ github.workflow }} / ${{ github.job }}"
to: ${{secrets.MAIL_SEND_TO}}
from: Akka CI
body: |
Job ${{ github.job }} in workflow ${{ github.workflow }} of ${{github.repository}} failed!
https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
Loading