Skip to content

Commit e7e2232

Browse files
authored
reorganize java project (#25)
* reorganize java project * fix docker workflow
1 parent 8ad417c commit e7e2232

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+73
-67
lines changed

.github/workflows/generic-workflow.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ on:
1010
jobs:
1111
build:
1212
runs-on: ubuntu-latest
13+
defaults:
14+
run:
15+
working-directory: ./server/
1316
steps:
1417
- name: checkout sources
1518
uses: actions/checkout@v4

.github/workflows/ssh-key-signer-server-docker.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ '*' ]
66
paths:
7-
- ssh-key-signer-server/**
7+
- server/ssh-key-signer-server/**
88
- .github/workflows/ssh-key-signer-server-docker.yml
99
workflow_call:
1010
inputs:
@@ -16,20 +16,25 @@ env:
1616
REGISTRY: docker.io
1717
IMAGE_NAME: ${{ github.repository }}
1818
PROJECT: ssh-key-signer-server
19+
PROJECT_DIR: ./server
1920

2021
jobs:
2122
build:
23+
defaults:
24+
run:
25+
working-directory: ${{ env.PROJECT_DIR }}
26+
2227
if: github.actor != 'dependabot[bot]'
2328
runs-on: ubuntu-latest
2429
steps:
25-
- name: "display sha"
26-
run: |
27-
echo "found sha ${{ inputs.sha }}"
28-
2930
- uses: actions/checkout@v4
3031
with:
3132
ref: ${{ inputs.sha }}
3233

34+
- name: "display sha"
35+
run: |
36+
echo "found sha ${{ inputs.sha }}"
37+
3338
- name: set up jdk
3439
uses: actions/setup-java@v4
3540
with:
@@ -73,7 +78,7 @@ jobs:
7378
- name: build and push
7479
uses: docker/build-push-action@v6
7580
with:
76-
context: ${{ env.PROJECT }}
81+
context: ${{ env.PROJECT_DIR }}/${{ env.PROJECT }}
7782
push: true
7883
platforms: linux/amd64,linux/arm64
7984
tags: ${{ steps.meta.outputs.tags }}

.github/workflows/ssh-key-signer-server-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ '*' ]
66
paths:
7-
- ssh-key-signer-server/**
7+
- server/ssh-key-signer-server/**
88
- .github/workflows/ssh-key-signer-server-workflow.yml
99
- .github/workflows/generic-workflow.yml
1010

.github/workflows/ssh-signer-common-lib-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [ '*' ]
66
paths:
7-
- ssh-signer-common-lib/**
7+
- server/ssh-signer-common-lib/**
88
- .github/workflows/ssh-signer-common-lib-workflow.yml
99
- .github/workflows/generic-workflow.yml
1010

pom.xml renamed to server/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66

77
<groupId>io.binarycodes.homelab</groupId>
88
<artifactId>ssh-signer-mono</artifactId>
9-
<name>Monorepo - SSH KeySigner</name>
9+
<name>SSH KeySigner</name>
1010
<version>0.0.4</version>
1111

1212
<packaging>pom</packaging>
1313

1414
<modules>
1515
<module>ssh-signer-common-lib</module>
1616
<module>ssh-key-signer-server</module>
17-
<module>ssh-hostkey-signer</module>
18-
<module>ssh-userkey-signer</module>
1917
</modules>
2018

2119
</project>
File renamed without changes.

ssh-key-signer-server/.mvn/wrapper/maven-wrapper.properties renamed to server/ssh-key-signer-server/.mvn/wrapper/maven-wrapper.properties

File renamed without changes.

ssh-key-signer-server/environment-setup/dev/docker/docker-compose.yml renamed to server/ssh-key-signer-server/environment-setup/dev/docker/docker-compose.yml

File renamed without changes.

0 commit comments

Comments
 (0)