Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Lucene packages to v2.9.4 #104

Open
wants to merge 2 commits into
base: helma-🐜
Choose a base branch
from
Open
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
42 changes: 42 additions & 0 deletions .github/actions/ssh/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: SSH setup
description: Set up the SSH agent

inputs:
config:
description: The SSH configuration
required: true
key:
description: The private SSH key
required: true
known-hosts:
description: The list of known hosts
required: true

runs:
using: composite

steps:
- name: Configure SSH
shell: sh
env:
CONFIG: ${{ inputs.config }}
KNOWN_HOSTS: ${{ inputs.known-hosts }}
run: |
mkdir -p ~/.ssh
echo "${CONFIG}" > ~/.ssh/config
echo "${KNOWN_HOSTS}" > ~/.ssh/known_hosts
- name: Start SSH agent
shell: bash
env:
SOCKET: /tmp/ssh-agent.sock
run: |
echo "SSH_AUTH_SOCK=${SOCKET}" >> $GITHUB_ENV
ssh-agent -a ${SOCKET} > /dev/null
- name: Add SSH key
shell: bash
env:
KEY: ${{ inputs.key }}
run: |
ssh-add - <<< "${KEY}"
21 changes: 8 additions & 13 deletions .github/workflows/stage.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: Deploy (Staging)

on:
workflow_dispatch

env:
SSH_AUTH_SOCK: /tmp/ssh-agent.sock
on: workflow_dispatch

jobs:
stage:
Expand All @@ -17,6 +13,13 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up SSH agent
uses: ./.github/actions/ssh
with:
config: ${{ vars.SSH_CONFIG }}
key: ${{ secrets.SSH_PRIVATE_KEY }}
known-hosts: ${{ vars.SSH_KNOWN_HOSTS }}

- name: Set up Java
uses: actions/setup-java@v4
with:
Expand All @@ -29,14 +32,6 @@ jobs:
- name: Build with Gradle
run: ./gradlew installDist

- name: Set up SSH agent
run: |
ssh-agent -a $SSH_AUTH_SOCK > /dev/null
ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}"
mkdir -p ~/.ssh
echo '${{ vars.SSH_CONFIG }}' > ~/.ssh/config
echo '${{ vars.KNOWN_HOSTS }}' > ~/.ssh/known_hosts

- name: Publish to staging server
run: |
rsync build/install/helma/ antville.dev:/ \
Expand Down
4 changes: 2 additions & 2 deletions modules/helma/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
dependencies {
runtimeOnly 'ch.ethz.ganymed:ganymed-ssh2:build209'
runtimeOnly 'net.sourceforge.jexcelapi:jxl:2.5.7'
runtimeOnly 'org.apache.lucene:lucene-analyzers:2.2.0'
runtimeOnly 'org.apache.lucene:lucene-core:2.2.0'
runtimeOnly 'org.apache.lucene:lucene-analyzers:2.9.4'
runtimeOnly 'org.apache.lucene:lucene-core:2.9.4'
}

jar.enabled = false
Expand Down
Loading