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: OpenOlitor/openolitor-server
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.4.26
Choose a base ref
...
head repository: OpenOlitor/openolitor-server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: prod
Choose a head ref
Loading
Showing 333 changed files with 12,692 additions and 5,932 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/dependency-graph.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Update Dependency Graph
on:
push:
branches:
- prod
jobs:
dependency-graph:
name: Update Dependency Graph
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: scalacenter/sbt-dependency-submission@v2
13 changes: 9 additions & 4 deletions .github/workflows/sbt-docker-prepublish.yml
Original file line number Diff line number Diff line change
@@ -10,11 +10,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- uses: actions/checkout@v4
- name: Install locales
run: sudo apt-get -y install locales
- name: Fix up git URLs
run: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 1.8
java-version: 21
distribution: temurin
- name: Docker Login
run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
- name: Build and Publish Docker Image
11 changes: 7 additions & 4 deletions .github/workflows/sbt-docker-publish.yml
Original file line number Diff line number Diff line change
@@ -10,13 +10,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install locales
run: sudo apt-get -y install locales
- name: Fix up git URLs
run: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 1.8
java-version: 21
distribution: temurin
- name: Docker Login
run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
- name: Build and Publish Docker Image
45 changes: 33 additions & 12 deletions .github/workflows/sbt-test.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,41 @@
name: sbt test

on:
push:
on: [push, pull_request]

jobs:
test:

runs-on: ubuntu-latest
permissions:
pull-requests: write
issues: write

steps:
- uses: actions/checkout@v2
- name: Fix up git URLs
run: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Run Tests
run: sbt test
- uses: actions/checkout@v4
- name: Install locales
run: sudo apt-get -y install locales
- name: Fix up git URLs
run: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 21
distribution: temurin
- name: Run Tests
run: sbt "coverage; test; coverageReport; coverageAggregate;"
- name: Coverage Report
uses: irongut/CodeCoverageSummary@v1.3.0
with:
filename: target/scala-2.13/coverage-report/cobertura.xml
badge: true
format: "markdown"
indicators: false
hide_complexity: true
output: "both"
- name: Coverage Report Pull Request Comment
uses: marocchino/sticky-pull-request-comment@v2
if: github.event_name == 'pull_request'
with:
recreate: true
path: code-coverage-results.md
- name: Coverage Summary
run: cat code-coverage-results.md >> $GITHUB_STEP_SUMMARY
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@ project/plugins/project/
.settings
/bin/
.idea
.bsp

# ensime
.ensime
3 changes: 3 additions & 0 deletions .run/Openolitor.run.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Openolitor" type="Application" factoryName="Application">
<option name="ALTERNATIVE_JRE_PATH" value="latest" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="MAIN_CLASS_NAME" value="ch.openolitor.core.Boot" />
<module name="openolitor-server" />
<method v="2">
<option name="Make" enabled="true" />
</method>
4 changes: 4 additions & 0 deletions .scala-steward.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
dependencyOverrides = [{
pullRequests = { frequency = "30 days" },
dependency = { groupId = "com.amazonaws", artifactId = "aws-java-sdk-s3" }
}]
8 changes: 0 additions & 8 deletions .travis.yml

This file was deleted.

Loading