mirror of
https://github.com/amithkoujalgi/ollama4j.git
synced 2025-05-15 03:47:13 +02:00
Merge pull request #56 from amithkoujalgi/test
Updated GitHub workflows to publish to GItHub packages instead of Maven Central
This commit is contained in:
Amith Koujalgi
GitHub
commit
7580c6a549
109
.github/workflows/maven-publish.yml
vendored
109
.github/workflows/maven-publish.yml
vendored
@ -1,68 +1,41 @@
|
||||
## This workflow will build a package using Maven and then publish it to GitHub packages when a release is created
|
||||
## For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path
|
||||
#
|
||||
#name: Test and Publish Package
|
||||
#
|
||||
##on:
|
||||
## release:
|
||||
## types: [ "created" ]
|
||||
#
|
||||
#on:
|
||||
# push:
|
||||
# branches: [ "main" ]
|
||||
# workflow_dispatch:
|
||||
#
|
||||
#jobs:
|
||||
# build:
|
||||
# runs-on: ubuntu-latest
|
||||
# permissions:
|
||||
# contents: write
|
||||
# packages: write
|
||||
# steps:
|
||||
# - uses: actions/checkout@v3
|
||||
# - name: Set up JDK 11
|
||||
# uses: actions/setup-java@v3
|
||||
# with:
|
||||
# java-version: '11'
|
||||
# distribution: 'adopt-hotspot'
|
||||
# server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
|
||||
# settings-path: ${{ github.workspace }} # location for the settings.xml file
|
||||
# - name: Build with Maven
|
||||
# run: mvn --file pom.xml -U clean package -Punit-tests
|
||||
# - name: Set up Apache Maven Central (Overwrite settings.xml)
|
||||
# uses: actions/setup-java@v3
|
||||
# with: # running setup-java again overwrites the settings.xml
|
||||
# java-version: '11'
|
||||
# distribution: 'adopt-hotspot'
|
||||
# cache: 'maven'
|
||||
# server-id: ossrh
|
||||
# server-username: MAVEN_USERNAME
|
||||
# server-password: MAVEN_PASSWORD
|
||||
# gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
|
||||
# gpg-passphrase: MAVEN_GPG_PASSPHRASE
|
||||
# - name: Set up Maven cache
|
||||
# uses: actions/cache@v3
|
||||
# with:
|
||||
# path: ~/.m2/repository
|
||||
# key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
|
||||
# restore-keys: |
|
||||
# ${{ runner.os }}-maven-
|
||||
# - name: Build
|
||||
# run: mvn -B -ntp clean install
|
||||
# - name: Upload coverage reports to Codecov
|
||||
# uses: codecov/codecov-action@v3
|
||||
# env:
|
||||
# CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
|
||||
# - name: Publish to GitHub Packages Apache Maven
|
||||
# # if: >
|
||||
# # github.event_name != 'pull_request' &&
|
||||
# # github.ref_name == 'main' &&
|
||||
# # contains(github.event.head_commit.message, 'release')
|
||||
# run: |
|
||||
# git config --global user.email "koujalgi.amith@gmail.com"
|
||||
# git config --global user.name "amithkoujalgi"
|
||||
# mvn -B -ntp -DskipTests -Pci-cd -Darguments="-DskipTests -Pci-cd" release:clean release:prepare release:perform
|
||||
# env:
|
||||
# MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
|
||||
# MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
|
||||
# MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
|
||||
# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created
|
||||
# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path
|
||||
|
||||
name: Release Artifacts
|
||||
|
||||
on:
|
||||
release:
|
||||
types: [ created ]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: read
|
||||
packages: write
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'temurin'
|
||||
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
|
||||
settings-path: ${{ github.workspace }} # location for the settings.xml file
|
||||
|
||||
- name: Find and Replace
|
||||
uses: jacobtomlinson/gha-find-replace@v3
|
||||
with:
|
||||
find: "ollama4j-revision"
|
||||
replace: ${{ github.ref_name }}
|
||||
regex: false
|
||||
|
||||
- name: Build with Maven
|
||||
run: mvn --file pom.xml -U clean package -Punit-tests
|
||||
|
||||
- name: Publish to GitHub Packages Apache Maven
|
||||
run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml --file pom.xml
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ github.token }}
|
||||
52
.github/workflows/publish-javadoc.yml
vendored
52
.github/workflows/publish-javadoc.yml
vendored
@ -1,52 +0,0 @@
|
||||
## Simple workflow for deploying static content to GitHub Pages
|
||||
#name: Deploy Javadoc content to Pages
|
||||
#
|
||||
#on:
|
||||
# # Runs on pushes targeting the default branch
|
||||
# push:
|
||||
# branches: [ "none" ]
|
||||
#
|
||||
# # Allows you to run this workflow manually from the Actions tab
|
||||
# workflow_dispatch:
|
||||
#
|
||||
## Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
|
||||
#permissions:
|
||||
# contents: read
|
||||
# pages: write
|
||||
# id-token: write
|
||||
# packages: write
|
||||
## Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
|
||||
## However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
|
||||
#concurrency:
|
||||
# group: "pages"
|
||||
# cancel-in-progress: false
|
||||
#
|
||||
#jobs:
|
||||
# # Single deploy job since we're just deploying
|
||||
# deploy:
|
||||
# runs-on: ubuntu-latest
|
||||
#
|
||||
# environment:
|
||||
# name: github-pages
|
||||
# url: ${{ steps.deployment.outputs.page_url }}
|
||||
# steps:
|
||||
# - uses: actions/checkout@v3
|
||||
# - name: Set up JDK 11
|
||||
# uses: actions/setup-java@v3
|
||||
# with:
|
||||
# java-version: '11'
|
||||
# distribution: 'adopt-hotspot'
|
||||
# server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
|
||||
# settings-path: ${{ github.workspace }} # location for the settings.xml file
|
||||
# - name: Build with Maven
|
||||
# run: mvn --file pom.xml -U clean package
|
||||
# - name: Setup Pages
|
||||
# uses: actions/configure-pages@v3
|
||||
# - name: Upload artifact
|
||||
# uses: actions/upload-pages-artifact@v2
|
||||
# with:
|
||||
# # Upload entire repository
|
||||
# path: './target/apidocs/.'
|
||||
# - name: Deploy to GitHub Pages
|
||||
# id: deployment
|
||||
# uses: actions/deploy-pages@v2
|
||||
@ -11,7 +11,7 @@ the [completion](https://github.com/jmorganca/ollama/blob/main/docs/api.md#gener
|
||||
Use the `OptionBuilder` to build the `Options` object
|
||||
with [extra parameters](https://github.com/jmorganca/ollama/blob/main/docs/modelfile.md#valid-parameters-and-values).
|
||||
Refer
|
||||
to [this](/docs/apis-extras/options-builder).
|
||||
to [this](/apis-extras/options-builder).
|
||||
|
||||
## Try asking a question about the model.
|
||||
|
||||
@ -53,18 +53,19 @@ public class Main {
|
||||
OllamaAPI ollamaAPI = new OllamaAPI(host);
|
||||
// define a stream handler (Consumer<String>)
|
||||
OllamaStreamHandler streamHandler = (s) -> {
|
||||
System.out.println(s);
|
||||
System.out.println(s);
|
||||
};
|
||||
|
||||
// Should be called using seperate thread to gain non blocking streaming effect.
|
||||
OllamaResult result = ollamaAPI.generate(config.getModel(),
|
||||
"What is the capital of France? And what's France's connection with Mona Lisa?",
|
||||
new OptionsBuilder().build(), streamHandler);
|
||||
"What is the capital of France? And what's France's connection with Mona Lisa?",
|
||||
new OptionsBuilder().build(), streamHandler);
|
||||
|
||||
System.out.println("Full response: " +result.getResponse());
|
||||
System.out.println("Full response: " + result.getResponse());
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
You will get a response similar to:
|
||||
|
||||
> The
|
||||
|
||||
@ -40,6 +40,8 @@ const config = {
|
||||
/** @type {import('@docusaurus/preset-classic').Options} */
|
||||
({
|
||||
docs: {
|
||||
path: 'docs',
|
||||
routeBasePath: '', // change this to any URL route you'd want. For example: `home` - if you want /home/intro.
|
||||
sidebarPath: './sidebars.js',
|
||||
// Please change this to your repo.
|
||||
// Remove this to remove the "edit this page" links.
|
||||
|
||||
68
maven-publish.yml
Normal file
68
maven-publish.yml
Normal file
@ -0,0 +1,68 @@
|
||||
## This workflow will build a package using Maven and then publish it to GitHub packages when a release is created
|
||||
## For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path
|
||||
#
|
||||
#name: Test and Publish Package
|
||||
#
|
||||
##on:
|
||||
## release:
|
||||
## types: [ "created" ]
|
||||
#
|
||||
#on:
|
||||
# push:
|
||||
# branches: [ "main" ]
|
||||
# workflow_dispatch:
|
||||
#
|
||||
#jobs:
|
||||
# build:
|
||||
# runs-on: ubuntu-latest
|
||||
# permissions:
|
||||
# contents: write
|
||||
# packages: write
|
||||
# steps:
|
||||
# - uses: actions/checkout@v3
|
||||
# - name: Set up JDK 11
|
||||
# uses: actions/setup-java@v3
|
||||
# with:
|
||||
# java-version: '11'
|
||||
# distribution: 'adopt-hotspot'
|
||||
# server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
|
||||
# settings-path: ${{ github.workspace }} # location for the settings.xml file
|
||||
# - name: Build with Maven
|
||||
# run: mvn --file pom.xml -U clean package -Punit-tests
|
||||
# - name: Set up Apache Maven Central (Overwrite settings.xml)
|
||||
# uses: actions/setup-java@v3
|
||||
# with: # running setup-java again overwrites the settings.xml
|
||||
# java-version: '11'
|
||||
# distribution: 'adopt-hotspot'
|
||||
# cache: 'maven'
|
||||
# server-id: ossrh
|
||||
# server-username: MAVEN_USERNAME
|
||||
# server-password: MAVEN_PASSWORD
|
||||
# gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
|
||||
# gpg-passphrase: MAVEN_GPG_PASSPHRASE
|
||||
# - name: Set up Maven cache
|
||||
# uses: actions/cache@v3
|
||||
# with:
|
||||
# path: ~/.m2/repository
|
||||
# key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
|
||||
# restore-keys: |
|
||||
# ${{ runner.os }}-maven-
|
||||
# - name: Build
|
||||
# run: mvn -B -ntp clean install
|
||||
# - name: Upload coverage reports to Codecov
|
||||
# uses: codecov/codecov-action@v3
|
||||
# env:
|
||||
# CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
|
||||
# - name: Publish to GitHub Packages Apache Maven
|
||||
# # if: >
|
||||
# # github.event_name != 'pull_request' &&
|
||||
# # github.ref_name == 'main' &&
|
||||
# # contains(github.event.head_commit.message, 'release')
|
||||
# run: |
|
||||
# git config --global user.email "koujalgi.amith@gmail.com"
|
||||
# git config --global user.name "amithkoujalgi"
|
||||
# mvn -B -ntp -DskipTests -Pci-cd -Darguments="-DskipTests -Pci-cd" release:clean release:prepare release:perform
|
||||
# env:
|
||||
# MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
|
||||
# MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
|
||||
# MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
|
||||
111
pom.xml
111
pom.xml
@ -1,14 +1,16 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>io.github.amithkoujalgi</groupId>
|
||||
<artifactId>ollama4j</artifactId>
|
||||
<version>1.0.78-SNAPSHOT</version>
|
||||
<version>ollama4j-revision</version>
|
||||
|
||||
<name>Ollama4j</name>
|
||||
<description>Java library for interacting with Ollama API.</description>
|
||||
<url>https://github.com/amithkoujalgi/ollama4j</url>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>11</maven.compiler.source>
|
||||
@ -127,15 +129,15 @@
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-release-plugin</artifactId>
|
||||
<version>3.0.1</version>
|
||||
<configuration>
|
||||
<!-- <goals>install</goals>-->
|
||||
<tagNameFormat>v@{project.version}</tagNameFormat>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<!-- <plugin>-->
|
||||
<!-- <groupId>org.apache.maven.plugins</groupId>-->
|
||||
<!-- <artifactId>maven-release-plugin</artifactId>-->
|
||||
<!-- <version>3.0.1</version>-->
|
||||
<!-- <configuration>-->
|
||||
<!-- <!– <goals>install</goals>–>-->
|
||||
<!-- <tagNameFormat>v@{project.version}</tagNameFormat>-->
|
||||
<!-- </configuration>-->
|
||||
<!-- </plugin>-->
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
@ -187,14 +189,23 @@
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<!-- <distributionManagement>-->
|
||||
<!-- <snapshotRepository>-->
|
||||
<!-- <id>ossrh</id>-->
|
||||
<!-- <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>-->
|
||||
<!-- </snapshotRepository>-->
|
||||
<!-- <repository>-->
|
||||
<!-- <id>ossrh</id>-->
|
||||
<!-- <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2</url>-->
|
||||
<!-- </repository>-->
|
||||
<!-- </distributionManagement>-->
|
||||
|
||||
<!-- Replaced publishing packages to GitHub Packages instead of Maven central -->
|
||||
<distributionManagement>
|
||||
<snapshotRepository>
|
||||
<id>ossrh</id>
|
||||
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
|
||||
</snapshotRepository>
|
||||
<repository>
|
||||
<id>ossrh</id>
|
||||
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2</url>
|
||||
<id>github</id>
|
||||
<name>GitHub Packages</name>
|
||||
<url>https://maven.pkg.github.com/amithkoujalgi/ollama4j</url>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
|
||||
@ -250,39 +261,39 @@
|
||||
</properties>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-gpg-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>sign-artifacts</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>sign</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<!-- Prevent gpg from using pinentry programs. Fixes:
|
||||
gpg: signing failed: Inappropriate ioctl for device -->
|
||||
<gpgArguments>
|
||||
<arg>--pinentry-mode</arg>
|
||||
<arg>loopback</arg>
|
||||
</gpgArguments>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.sonatype.plugins</groupId>
|
||||
<artifactId>nexus-staging-maven-plugin</artifactId>
|
||||
<version>1.6.13</version>
|
||||
<extensions>true</extensions>
|
||||
<configuration>
|
||||
<serverId>ossrh</serverId>
|
||||
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
|
||||
<autoReleaseAfterClose>true</autoReleaseAfterClose>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<!-- <plugin>-->
|
||||
<!-- <groupId>org.apache.maven.plugins</groupId>-->
|
||||
<!-- <artifactId>maven-gpg-plugin</artifactId>-->
|
||||
<!-- <version>3.1.0</version>-->
|
||||
<!-- <executions>-->
|
||||
<!-- <execution>-->
|
||||
<!-- <id>sign-artifacts</id>-->
|
||||
<!-- <phase>verify</phase>-->
|
||||
<!-- <goals>-->
|
||||
<!-- <goal>sign</goal>-->
|
||||
<!-- </goals>-->
|
||||
<!-- <configuration>-->
|
||||
<!-- <!– Prevent gpg from using pinentry programs. Fixes:-->
|
||||
<!-- gpg: signing failed: Inappropriate ioctl for device –>-->
|
||||
<!-- <gpgArguments>-->
|
||||
<!-- <arg>--pinentry-mode</arg>-->
|
||||
<!-- <arg>loopback</arg>-->
|
||||
<!-- </gpgArguments>-->
|
||||
<!-- </configuration>-->
|
||||
<!-- </execution>-->
|
||||
<!-- </executions>-->
|
||||
<!-- </plugin>-->
|
||||
<!-- <plugin>-->
|
||||
<!-- <groupId>org.sonatype.plugins</groupId>-->
|
||||
<!-- <artifactId>nexus-staging-maven-plugin</artifactId>-->
|
||||
<!-- <version>1.6.13</version>-->
|
||||
<!-- <extensions>true</extensions>-->
|
||||
<!-- <configuration>-->
|
||||
<!-- <serverId>ossrh</serverId>-->
|
||||
<!-- <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>-->
|
||||
<!-- <autoReleaseAfterClose>true</autoReleaseAfterClose>-->
|
||||
<!-- </configuration>-->
|
||||
<!-- </plugin>-->
|
||||
|
||||
<plugin>
|
||||
<groupId>org.jacoco</groupId>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user