Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
version: 2
updates:
- package-ecosystem: "maven" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"

- package-ecosystem: "github-actions" # Also update Github actions
directory: "/"
schedule:
# Check for updates to GitHub Actions every week
interval: "weekly"
17 changes: 10 additions & 7 deletions .github/workflows/merge-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,36 @@

name: Merge / Push Build

on: [push]
on:
push:
branches:
- 'master'

jobs:
publish-snapshot:
name: publish to oss sonatype & push image

runs-on: ubuntu-latest

permissions:
permissions:
contents: read
packages: write

env:
MAVEN_OPTS: "-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m"

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v5
with:
distribution: 'temurin'
architecture: x64
java-version: 11
java-version: 17

- name: maven-settings-xml-action
uses: whelk-io/maven-settings-xml-action@v14
uses: whelk-io/maven-settings-xml-action@v22
with:
repositories: '[{ "id": "sonatype", "url": "https://oss.sonatype.org/content/repositories/snapshots/", "releases": {"enabled": "false"}, "snapshots": {"enabled": "true" }}]'

Expand All @@ -58,7 +61,7 @@ jobs:
run: mvn -B -e clean install

- name: Checkout tools repo
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
repository: Commonjava/commonjava-images
path: commonjava-images
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,17 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v6

- name: Set up JDK
uses: actions/setup-java@v2
uses: actions/setup-java@v5
with:
java-version: '11'
distribution: 'adopt'
distribution: 'temurin'
architecture: x64
java-version: 17

- name: maven-settings-xml-action
uses: whelk-io/maven-settings-xml-action@v14
uses: whelk-io/maven-settings-xml-action@v22
with:
repositories: '[{ "id": "sonatype", "url": "https://oss.sonatype.org/content/repositories/snapshots/", "releases": {"enabled": "false"}, "snapshots": {"enabled": "true" }}]'

Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,7 @@ hs_err_pid*

# cache is generated folder
cache/

# config is used for local testing
config/

Loading