Skip to content

Commit

Permalink
feat: add a proper search
Browse files Browse the repository at this point in the history
  • Loading branch information
rvullriede committed Dec 2, 2024
1 parent 85d0acd commit 375d259
Show file tree
Hide file tree
Showing 9 changed files with 424 additions and 100 deletions.
17 changes: 10 additions & 7 deletions .github/workflows/build-on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,23 @@ name: build-on-push

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
branches-ignore:
- main

jobs:
build:
build-on-push:
runs-on: ubuntu-latest

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

- name: setup-jdk
uses: actions/setup-java@v4
with:
java-version: 21
distribution: 'temurin'
cache: maven
- name: maven-build
run: mvn --batch-mode --update-snapshots package

- name: maven-build-verify
run: mvn --batch-mode --update-snapshots verify
60 changes: 60 additions & 0 deletions .github/workflows/build-release-on-main-push.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: build-release-on-main-push

on:
push:
branches:
- main

jobs:
build-release-on-main-push:
if: ${{ !contains(github.event.head_commit.message, '[release]') }} # prevent recursive releases

permissions:
contents: write
packages: write

strategy:
matrix:
os: [ ubuntu-latest, windows-latest, macos-13, macos-14 ]

runs-on: ${{ matrix.os }}

steps:
- name: checkout
uses: actions/checkout@v4
with:
ref: main

- name: setup-jdk
uses: actions/setup-java@v4
with:
java-version: 21
distribution: 'temurin'
cache: 'maven'

- name: maven-build-verify
run: mvn --batch-mode -Pnative-jpackage clean verify

- name: configure-git-user
uses: qoomon/actions--setup-git@v1
with:
user: bot

- name: get-latest-tag
id: get-latest-tag
uses: WyriHaximus/github-action-get-previous-tag@v1

- name: create-release-notes
uses: softprops/action-gh-release@v2
with:
generate_release_notes: true
tag_name: ${{ steps.get-latest-tag.outputs.tag }}
files: target/dist/*

- name: merge-main-to-dev
run: |
git fetch --unshallow
git checkout dev
git pull
git merge --no-ff main -m "[release] auto-merge released main back to dev"
git push
26 changes: 26 additions & 0 deletions .github/workflows/dependabot-pr-auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: dependabot-pr-auto-merge

on: pull_request

permissions:
contents: write
pull-requests: write

jobs:
dependabot-pr-auto-merge:
runs-on: ubuntu-latest

if: github.actor == 'dependabot[bot]'
steps:
- name: dependabot-pr-fetch-metadata
uses: dependabot/fetch-metadata@v2

- name: dependabot-pr-approve
run: gh pr review --approve "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}

- name: dependabot-pr-auto-merge
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
32 changes: 0 additions & 32 deletions .github/workflows/publish-on-release.yml

This file was deleted.

4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.18.0</version>
<version>2.18.2</version>
</dependency>

<dependency>
Expand All @@ -51,7 +51,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.5.9</version>
<version>1.5.12</version>
</dependency>

</dependencies>
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,18 @@
requires javafx.graphics;
requires java.desktop; // for AWT stuff


requires com.fasterxml.jackson.core;
requires com.fasterxml.jackson.databind;

requires org.fxmisc.richtext;
requires org.fxmisc.flowless;


requires org.apache.commons.compress;

requires org.slf4j;

requires java.prefs;
requires org.apache.commons.lang3;

exports net.osslabz.loggazer to javafx.graphics;
}
Loading

0 comments on commit 375d259

Please sign in to comment.