dev to basic spring #9

Merged
hirst merged 20 commits from dev into basic-spring 2024-05-31 08:26:27 +02:00
7 changed files with 188 additions and 54 deletions

33
.github/workflows/build_deploy_dev.yml vendored Normal file
View file

@ -0,0 +1,33 @@
name: build and publish docker image / deploy
on:
push:
branches: ["dev"]
pull_request:
branches: ["dev"]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: https://github.com/actions/checkout@v4
with:
repository: 'learningpulse/server'
ref: 'dev'
token: '${{ secrets.token }}'
- name: 'Set up java 22'
uses: https://github.com/actions/setup-java@v3
with:
java-version: "22"
distribution: "temurin"
- name: "Setup maven"
uses: https://github.com/stCarolas/setup-maven@v5
- name: Build with Maven
run: mvn -Dtoken=${{ secrets.token }} clean compile jib:build -e

2
.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
result/*
result

View file

@ -2,18 +2,17 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716293225, "lastModified": 1716509168,
"narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "id": "nixpkgs",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "type": "indirect"
"type": "github"
} }
}, },
"root": { "root": {

121
flake.nix
View file

@ -1,48 +1,95 @@
{ {
description = "Learning Pulse"; description = "CI, devshell and package definition for learningpulse";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
}; };
outputs = { self, nixpkgs, ... }:
outputs =
{ self
, nixpkgs
, maven
, makeWrapper
}:
let let
javaVersion = 22; # TODO add more systems
overlays = [ system = "x86_64-linux";
(final: prev: rec { pkgs = import nixpkgs { inherit system; };
jdk = prev."jdk${toString javaVersion}";
gradle = prev.gradle.override { java = jdk; };
maven = prev.maven.override { inherit jdk; };
})
];
supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
pkgs = import nixpkgs { inherit overlays system; };
});
buildPackages = with pkgs; [
jdk22
makeWrapper
];
in in
{ rec {
hydraJobs = { packages.${system} =
gateway = maven.buildMavenPackage rec { {
pname = "learningpulse-gateway"; learningpulse-gateway = pkgs.maven.buildMavenPackage rec {
version = "1.2.1"; pname = "gateway";
# version = "0.0.1";
# hello i wrote something here to test pulling
src = ./.;
# todo get automatically
mvnHash = "sha256-YCK1Qujgx73cZdEx2mRip+y+66px5TxL247fBIMyoy4=";
nativeBuildInputs = buildPackages;
installPhase = ''
mkdir -p $out/bin $out/share/${pname}
install -Dm644 ${pname}/target/${pname}-${version}.jar $out/share/${pname}
makeWrapper ${pkgs.jre8}/bin/java $out/bin/${pname} \
--add-flags "-jar $out/share/${pname}/${pname}-${version}.jar"
'';
};
learningpulse-eureka = pkgs.maven.buildMavenPackage rec {
pname = "eureka";
version = "0.0.1";
src = ./.;
# todo get automatically
mvnHash = "sha256-YCK1Qujgx73cZdEx2mRip+y+66px5TxL247fBIMyoy4=";
nativeBuildInputs = buildPackages;
installPhase = ''
mkdir -p $out/bin $out/share/${pname}
install -Dm644 ${pname}/target/${pname}-${version}.jar $out/share/${pname}
makeWrapper ${pkgs.jre8}/bin/java $out/bin/${pname} \
--add-flags "-jar $out/share/${pname}/${pname}-${version}.jar"
'';
};
learningpulse-dummy = pkgs.maven.buildMavenPackage rec {
pname = "dummy";
version = "0.0.1";
src = ./.;
# todo get automatically
mvnHash = "sha256-YCK1Qujgx73cZdEx2mRip+y+66px5TxL247fBIMyoy4=";
nativeBuildInputs = buildPackages;
installPhase = ''
mkdir -p $out/bin $out/share/${pname}
install -Dm644 ${pname}/target/${pname}-${version}.jar $out/share/${pname}
makeWrapper ${pkgs.jre8}/bin/java $out/bin/${pname} \
--add-flags "-jar $out/share/${pname}/${pname}-${version}.jar"
'';
};
}; };
hydraJobs = {
inherit (self)
packages;
}; };
devShells = forEachSupportedSystem ({ pkgs }: { devShells."${system}".default = pkgs.mkShell {
default = pkgs.mkShell { buildInputs = with pkgs; [
packages = with pkgs; [ maven
jdk jdk22
maven jre8
]; # top run actions locally
}; act
}); ];
};
}; };
} }

View file

@ -6,7 +6,6 @@
<groupId>com.learningpulse</groupId> <groupId>com.learningpulse</groupId>
<artifactId>server</artifactId> <artifactId>server</artifactId>
<version>0.0.1</version> <version>0.0.1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<artifactId>gateway</artifactId> <artifactId>gateway</artifactId>
<version>0.0.1</version> <version>0.0.1</version>

49
pom.xml
View file

@ -61,21 +61,52 @@
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>3.4.2</version>
<configuration>
<from>
<image>eclipse-temurin:22-jre</image>
<!-- <auth>
<username>${dockerusername}</username>
<password>${dockerpassword}</password>
</auth> -->
<platforms>
<platform>
<architecture>amd64</architecture>
<os>linux</os>
</platform>
<platform>
<architecture>arm64</architecture>
<os>linux</os>
</platform>
</platforms>
</from>
<to>
<image>git.4o1x5.dev/learningpulse/server/${project.artifactId}:${project.version}</image>
<auth>
<username>hydrabot</username>
<password>${token}</password>
</auth>
</to>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>dockerBuild</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</pluginManagement>
</build> </build>
</project> </project>

23
readme.md Normal file
View file

@ -0,0 +1,23 @@
# LearningPulse server
## CI/CD
To check up on builds head to [the hydra server](https://hydra.4o1x5.dev/project/learningpulse)
### Enter developer shell
```bash
nix develop
```
### Build services
```bash
nix build .#learningpulse-dummy
```
### Run service
```bash
nix develop && cd dummy && mvn run spring-boot:run
```