From fbfa29a8676b07203801c83e184c0bb0652a2827 Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Fri, 24 May 2024 09:37:55 +0200 Subject: [PATCH 01/17] tryna build with java --- flake.nix | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index 538215b..87c1ca3 100644 --- a/flake.nix +++ b/flake.nix @@ -10,32 +10,47 @@ , nixpkgs , maven , makeWrapper + , ... }: let - javaVersion = 22; overlays = [ (final: prev: rec { - jdk = prev."jdk${toString javaVersion}"; - gradle = prev.gradle.override { java = jdk; }; + jdk = prev."jdk22"; maven = prev.maven.override { inherit jdk; }; }) ]; - supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + + supportedSystems = [ + "x86_64-linux" + "aarch64-linux" + ]; + forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f { pkgs = import nixpkgs { inherit overlays system; }; }); in { - hydraJobs = { - gateway = maven.buildMavenPackage rec { - pname = "learningpulse-gateway"; - version = "1.2.1"; - # - # hello i wrote something here to test pulling + packages = { + + learningpulse-discovery = with lib; maven.buildMavenPackage { + pname = "learningpulse-discovery"; + version = "1.1.1"; + + src = ./eurika; + # todo get hash from package + mvnHash = lib.fakeSha256; + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin $out/share/jd-cli + install -Dm644 jd-cli/target/jd-cli.jar $out/share/jd-cli + + makeWrapper ${nixpkgs.pkgs.jre8}/bin/java $out/bin/jd-cli \ + --add-flags "-jar $out/share/jd-cli/jd-cli.jar" + ''; }; }; - devShells = forEachSupportedSystem ({ pkgs }: { default = pkgs.mkShell { packages = with pkgs; [ -- 2.44.1 From 9b23cd16c277b1b425966b4c71926c788084f3ce Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Sat, 25 May 2024 16:33:17 +0200 Subject: [PATCH 02/17] switched to mkderivation --- flake.nix | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/flake.nix b/flake.nix index 87c1ca3..3e8f8db 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,7 @@ , nixpkgs , maven , makeWrapper + , stdenv , ... }: let @@ -32,32 +33,29 @@ in { packages = { + learningpulse-discovery = stdenv.mkDerivation rec { + pname = "gateway"; + version = "1.0"; - learningpulse-discovery = with lib; maven.buildMavenPackage { - pname = "learningpulse-discovery"; - version = "1.1.1"; + src = ./.; + buildInputs = [ maven ]; - src = ./eurika; - # todo get hash from package - mvnHash = lib.fakeSha256; - nativeBuildInputs = [ makeWrapper ]; + buildPhase = '' + mvn --offline -Dmaven.repo.local=gateway package; + ''; installPhase = '' - mkdir -p $out/bin $out/share/jd-cli - install -Dm644 jd-cli/target/jd-cli.jar $out/share/jd-cli - - makeWrapper ${nixpkgs.pkgs.jre8}/bin/java $out/bin/jd-cli \ - --add-flags "-jar $out/share/jd-cli/jd-cli.jar" + install -Dm644 target/${pname}-${version}.jar $out/share/java ''; }; + devShells = forEachSupportedSystem ({ pkgs }: { + default = pkgs.mkShell { + packages = with pkgs; [ + jdk + maven + ]; + }; + }); }; - devShells = forEachSupportedSystem ({ pkgs }: { - default = pkgs.mkShell { - packages = with pkgs; [ - jdk - maven - ]; - }; - }); }; } -- 2.44.1 From 3534dee0f47ce5637fb62de8932ddd6db32f6c04 Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Mon, 27 May 2024 18:34:24 +0200 Subject: [PATCH 03/17] flake build eureka and gateway --- flake.lock | 13 +++--- flake.nix | 108 +++++++++++++++++++++++++++--------------------- gateway/pom.xml | 1 - result | 1 + 4 files changed, 67 insertions(+), 56 deletions(-) create mode 120000 result diff --git a/flake.lock b/flake.lock index e6e6355..8af82e3 100644 --- a/flake.lock +++ b/flake.lock @@ -2,18 +2,17 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1716293225, - "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", - "owner": "nixos", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { - "owner": "nixos", + "id": "nixpkgs", "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "indirect" } }, "root": { diff --git a/flake.nix b/flake.nix index 3e8f8db..8aa25c1 100644 --- a/flake.nix +++ b/flake.nix @@ -1,61 +1,73 @@ { - description = "Learning Pulse"; - + description = "CI, devshell and package definition for learningpulse"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + nixpkgs.url = "nixpkgs/nixos-unstable"; }; - - outputs = - { self - , nixpkgs - , maven - , makeWrapper - , stdenv - , ... - }: + outputs = { self, nixpkgs, ... }: let - overlays = [ - (final: prev: rec { - jdk = prev."jdk22"; - maven = prev.maven.override { inherit jdk; }; - }) + + # TODO add more systems + system = "x86_64-linux"; + pkgs = import nixpkgs { inherit system; }; + + buildPackages = with pkgs; [ + jdk22 + makeWrapper ]; - - supportedSystems = [ - "x86_64-linux" - "aarch64-linux" - ]; - - forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f { - pkgs = import nixpkgs { inherit overlays system; }; - }); - in - { - packages = { - learningpulse-discovery = stdenv.mkDerivation rec { - pname = "gateway"; - version = "1.0"; + rec { + packages.${system} = + { + learningpulse-gateway = pkgs.maven.buildMavenPackage rec { + pname = "gateway"; + version = "0.0.1"; - src = ./.; - buildInputs = [ maven ]; + src = ./.; + # todo get automatically + mvnHash = "sha256-YCK1Qujgx73cZdEx2mRip+y+66px5TxL247fBIMyoy4="; - buildPhase = '' - mvn --offline -Dmaven.repo.local=gateway package; - ''; + nativeBuildInputs = buildPackages; - installPhase = '' - install -Dm644 target/${pname}-${version}.jar $out/share/java - ''; - }; - devShells = forEachSupportedSystem ({ pkgs }: { - default = pkgs.mkShell { - packages = with pkgs; [ - jdk - maven - ]; + installPhase = '' + mkdir -p $out/bin $out/share/${pname} + install -Dm644 ${pname}/target/${pname}-${version}.jar $out/share/${pname}-${version} + + 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}-${version} + + makeWrapper ${pkgs.jre8}/bin/java $out/bin/${pname}- \ + --add-flags "-jar $out/share/${pname}/${pname}-${version}.jar" + ''; + }; + + }; + hydraJobs = { + inherit (self) + packages; + }; + + devShells."${system}".default = pkgs.mkShell { + buildInputs = with pkgs; [ + maven + jdk22 + jre8 + ]; }; }; + } diff --git a/gateway/pom.xml b/gateway/pom.xml index 018a68c..3ee47aa 100644 --- a/gateway/pom.xml +++ b/gateway/pom.xml @@ -6,7 +6,6 @@ com.learningpulse server 0.0.1 - gateway 0.0.1 diff --git a/result b/result new file mode 120000 index 0000000..6be4ed6 --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/v6lrgj18jgvwli3irsdabgj5nc712gfc-gateway-0.0.1 \ No newline at end of file -- 2.44.1 From 3e80c6a896cfcc29f103fc2b5d9abe1ea5ce6f04 Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Mon, 27 May 2024 20:26:32 +0200 Subject: [PATCH 04/17] added dummy to flake --- flake.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/flake.nix b/flake.nix index 8aa25c1..b5ef539 100644 --- a/flake.nix +++ b/flake.nix @@ -55,7 +55,26 @@ ''; }; + 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}-${version} + + makeWrapper ${pkgs.jre8}/bin/java $out/bin/${pname}- \ + --add-flags "-jar $out/share/${pname}/${pname}-${version}.jar" + ''; + }; }; + hydraJobs = { inherit (self) packages; -- 2.44.1 From 024312776a9b81849a3beb663ac54544aba7bf8d Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Mon, 27 May 2024 20:39:00 +0200 Subject: [PATCH 05/17] hydra config --- .hydra/project.json | 29 +++++++++++++++++++++++++++++ test.hjson | 0 2 files changed, 29 insertions(+) create mode 100644 .hydra/project.json create mode 100644 test.hjson diff --git a/.hydra/project.json b/.hydra/project.json new file mode 100644 index 0000000..bf2c214 --- /dev/null +++ b/.hydra/project.json @@ -0,0 +1,29 @@ +{ + "enabled": 1, + "hidden": false, + "description": "Server", + "nixexprinput": "generator", + "nixexprpath": "flake.nix", + "checkinterval": 300, + "schedulingshares": 100, + "enableemail": false, + "emailoverride": "", + "keepnr": 3, + "inputs": { + "main": { + "type": "git", + "value": "https://git.4o1x5.dev/learningpulse/server.git dev", + "emailresponsible": false, + + "gitea_repo_name": "server", + "gitea_repo_owner": "learningpulse", + "gitea_status_repo": "dev", + "gite_http_url": "https://git.4o1x5.dev" + }, + "nixpkgs": { + "type": "git", + "value": "https://github.com/NixOS/nixpkgs.git nixos-unstable", + "emailresponsible": false + } + } +} \ No newline at end of file diff --git a/test.hjson b/test.hjson new file mode 100644 index 0000000..e69de29 -- 2.44.1 From 64305b10ddae8c68ffcdc49809545d8ed8acb959 Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Tue, 28 May 2024 23:42:05 +0200 Subject: [PATCH 06/17] flake done? --- .gitignore | 2 ++ .hydra/project.json | 29 ----------------------------- flake.nix | 17 +++++++++-------- readme.md | 23 +++++++++++++++++++++++ result | 2 +- test.hjson | 0 6 files changed, 35 insertions(+), 38 deletions(-) create mode 100644 .gitignore delete mode 100644 .hydra/project.json create mode 100644 readme.md delete mode 100644 test.hjson diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7141f51 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +result/* +result \ No newline at end of file diff --git a/.hydra/project.json b/.hydra/project.json deleted file mode 100644 index bf2c214..0000000 --- a/.hydra/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "enabled": 1, - "hidden": false, - "description": "Server", - "nixexprinput": "generator", - "nixexprpath": "flake.nix", - "checkinterval": 300, - "schedulingshares": 100, - "enableemail": false, - "emailoverride": "", - "keepnr": 3, - "inputs": { - "main": { - "type": "git", - "value": "https://git.4o1x5.dev/learningpulse/server.git dev", - "emailresponsible": false, - - "gitea_repo_name": "server", - "gitea_repo_owner": "learningpulse", - "gitea_status_repo": "dev", - "gite_http_url": "https://git.4o1x5.dev" - }, - "nixpkgs": { - "type": "git", - "value": "https://github.com/NixOS/nixpkgs.git nixos-unstable", - "emailresponsible": false - } - } -} \ No newline at end of file diff --git a/flake.nix b/flake.nix index b5ef539..7a86d72 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,6 @@ }; outputs = { self, nixpkgs, ... }: let - # TODO add more systems system = "x86_64-linux"; pkgs = import nixpkgs { inherit system; }; @@ -30,12 +29,13 @@ installPhase = '' mkdir -p $out/bin $out/share/${pname} - install -Dm644 ${pname}/target/${pname}-${version}.jar $out/share/${pname}-${version} + install -Dm644 ${pname}/target/${pname}-${version}.jar $out/share/${pname} - makeWrapper ${pkgs.jre8}/bin/java $out/bin/${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"; @@ -48,9 +48,9 @@ installPhase = '' mkdir -p $out/bin $out/share/${pname} - install -Dm644 ${pname}/target/${pname}-${version}.jar $out/share/${pname}-${version} + install -Dm644 ${pname}/target/${pname}-${version}.jar $out/share/${pname} - makeWrapper ${pkgs.jre8}/bin/java $out/bin/${pname}- \ + makeWrapper ${pkgs.jre8}/bin/java $out/bin/${pname} \ --add-flags "-jar $out/share/${pname}/${pname}-${version}.jar" ''; }; @@ -64,17 +64,18 @@ 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}-${version} + install -Dm644 ${pname}/target/${pname}-${version}.jar $out/share/${pname} - makeWrapper ${pkgs.jre8}/bin/java $out/bin/${pname}- \ + makeWrapper ${pkgs.jre8}/bin/java $out/bin/${pname} \ --add-flags "-jar $out/share/${pname}/${pname}-${version}.jar" ''; + }; }; + hydraJobs = { inherit (self) packages; diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..a6fde47 --- /dev/null +++ b/readme.md @@ -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 +``` diff --git a/result b/result index 6be4ed6..9053ccf 120000 --- a/result +++ b/result @@ -1 +1 @@ -/nix/store/v6lrgj18jgvwli3irsdabgj5nc712gfc-gateway-0.0.1 \ No newline at end of file +/nix/store/zmnh05nkqyynsmshiqfhq28bj9iiww0i-gateway-0.0.1 \ No newline at end of file diff --git a/test.hjson b/test.hjson deleted file mode 100644 index e69de29..0000000 -- 2.44.1 From 24eae7839cf3b15cdfa957e2329ca7386cf56311 Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Tue, 28 May 2024 23:46:43 +0200 Subject: [PATCH 07/17] removed result --- result | 1 - 1 file changed, 1 deletion(-) delete mode 120000 result diff --git a/result b/result deleted file mode 120000 index 9053ccf..0000000 --- a/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/zmnh05nkqyynsmshiqfhq28bj9iiww0i-gateway-0.0.1 \ No newline at end of file -- 2.44.1 From 6e3904b1534906739cdf217372cddbf373484a21 Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Thu, 30 May 2024 04:20:39 +0200 Subject: [PATCH 08/17] act to build and publish images, test --- .github/workflows/build_deploy_dev.yml | 25 +++++++++++++ flake.nix | 2 ++ pom.xml | 49 +++++++++++++++++++++----- 3 files changed, 67 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/build_deploy_dev.yml diff --git a/.github/workflows/build_deploy_dev.yml b/.github/workflows/build_deploy_dev.yml new file mode 100644 index 0000000..3a814b3 --- /dev/null +++ b/.github/workflows/build_deploy_dev.yml @@ -0,0 +1,25 @@ +name: build and publish docker image / deploy + +on: + push: + branches: ["dev"] + pull_request: + branches: ["dev"] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 21 + uses: actions/setup-java@v3 + with: + java-version: "22" + distribution: "temurin" + cache: maven + - name: Build with Maven + run: mvn -Dtoken=${{secrets.usertoken }} clean compile jib:build -e + + + diff --git a/flake.nix b/flake.nix index 7a86d72..4711d3e 100644 --- a/flake.nix +++ b/flake.nix @@ -86,6 +86,8 @@ maven jdk22 jre8 + # top run actions locally + act ]; }; }; diff --git a/pom.xml b/pom.xml index ebd117c..5bf23f8 100644 --- a/pom.xml +++ b/pom.xml @@ -61,21 +61,52 @@ - + org.springframework.boot spring-boot-maven-plugin + + com.google.cloud.tools + jib-maven-plugin + 3.4.2 + + + eclipse-temurin:21-jre + + + + amd64 + linux + + + arm64 + linux + + + + + git.4o1x5.dev/learningpulse/server/${project.artifactId}:${project.version} + + hydrabot + ${token} + + + + + + package + + dockerBuild + + + + - - - - org.springframework.boot - spring-boot-maven-plugin - - - -- 2.44.1 From 0816ba7ee96c8c39c7408f65c3f3e5769f746242 Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Thu, 30 May 2024 05:20:35 +0200 Subject: [PATCH 09/17] ref to github for actions aslo fixed token --- .github/workflows/build_deploy_dev.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_deploy_dev.yml b/.github/workflows/build_deploy_dev.yml index 3a814b3..32dd730 100644 --- a/.github/workflows/build_deploy_dev.yml +++ b/.github/workflows/build_deploy_dev.yml @@ -6,20 +6,21 @@ on: pull_request: branches: ["dev"] + jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: https://github.com/actions/checkout@v4 - name: Set up JDK 21 - uses: actions/setup-java@v3 + uses: https://github.com/actions/setup-java@v3 with: java-version: "22" distribution: "temurin" cache: maven - name: Build with Maven - run: mvn -Dtoken=${{secrets.usertoken }} clean compile jib:build -e + run: mvn -Dtoken=${{ secrets.usertoken }} clean compile jib:build -e -- 2.44.1 From 55dfc95a78913d480fc89e4a4406753d5bc7d544 Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Thu, 30 May 2024 05:29:27 +0200 Subject: [PATCH 10/17] due to using forgejo actions some fillins have to be made --- .github/workflows/build_deploy_dev.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_deploy_dev.yml b/.github/workflows/build_deploy_dev.yml index 32dd730..54b51f8 100644 --- a/.github/workflows/build_deploy_dev.yml +++ b/.github/workflows/build_deploy_dev.yml @@ -13,6 +13,11 @@ jobs: steps: - uses: https://github.com/actions/checkout@v4 + with: + repository: 'learningpulse/server' + ref: 'dev' + token: '${{ secrets.token }}' + - name: Set up JDK 21 uses: https://github.com/actions/setup-java@v3 with: @@ -20,7 +25,7 @@ jobs: distribution: "temurin" cache: maven - name: Build with Maven - run: mvn -Dtoken=${{ secrets.usertoken }} clean compile jib:build -e + run: mvn -Dtoken=${{ secrets.token }} clean compile jib:build -e -- 2.44.1 From 2aaed98ae6f42d0f2d8809b627e784e39942ed1e Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Thu, 30 May 2024 05:57:47 +0200 Subject: [PATCH 11/17] actions update --- .github/workflows/build_deploy_dev.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_deploy_dev.yml b/.github/workflows/build_deploy_dev.yml index 54b51f8..199f597 100644 --- a/.github/workflows/build_deploy_dev.yml +++ b/.github/workflows/build_deploy_dev.yml @@ -17,13 +17,14 @@ jobs: repository: 'learningpulse/server' ref: 'dev' token: '${{ secrets.token }}' - - - name: Set up JDK 21 - uses: https://github.com/actions/setup-java@v3 + - name: 'Set up java 22' + uses: https://github.com/oracle-actions/setup-java@v1 with: - java-version: "22" - distribution: "temurin" - cache: maven + website: oracle.com + release: 22 + version: 17.0.10 + - name: "Setup maven" + uses: https://github.com/s4u/setup-maven-action@1 - name: Build with Maven run: mvn -Dtoken=${{ secrets.token }} clean compile jib:build -e -- 2.44.1 From 88e852cbcfb1590b30786f641e1822d0cb40a2d3 Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Thu, 30 May 2024 05:58:39 +0200 Subject: [PATCH 12/17] fix: typo for action --- .github/workflows/build_deploy_dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_deploy_dev.yml b/.github/workflows/build_deploy_dev.yml index 199f597..03652d2 100644 --- a/.github/workflows/build_deploy_dev.yml +++ b/.github/workflows/build_deploy_dev.yml @@ -24,7 +24,7 @@ jobs: release: 22 version: 17.0.10 - name: "Setup maven" - uses: https://github.com/s4u/setup-maven-action@1 + uses: https://github.com/s4u/setup-maven-action@v1 - name: Build with Maven run: mvn -Dtoken=${{ secrets.token }} clean compile jib:build -e -- 2.44.1 From b0e8c7c06ce1bdba9903a38e356b44cc0b855278 Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Thu, 30 May 2024 06:00:48 +0200 Subject: [PATCH 13/17] fix: actions mvn version --- .github/workflows/build_deploy_dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_deploy_dev.yml b/.github/workflows/build_deploy_dev.yml index 03652d2..4dc11de 100644 --- a/.github/workflows/build_deploy_dev.yml +++ b/.github/workflows/build_deploy_dev.yml @@ -24,7 +24,7 @@ jobs: release: 22 version: 17.0.10 - name: "Setup maven" - uses: https://github.com/s4u/setup-maven-action@v1 + uses: https://github.com/s4u/setup-maven-action@v1.13.0 - name: Build with Maven run: mvn -Dtoken=${{ secrets.token }} clean compile jib:build -e -- 2.44.1 From 917cec6173a72c303c9999d3d72402567492b5a6 Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Thu, 30 May 2024 06:02:53 +0200 Subject: [PATCH 14/17] fix: return to older java action --- .github/workflows/build_deploy_dev.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_deploy_dev.yml b/.github/workflows/build_deploy_dev.yml index 4dc11de..a3441a4 100644 --- a/.github/workflows/build_deploy_dev.yml +++ b/.github/workflows/build_deploy_dev.yml @@ -18,11 +18,10 @@ jobs: ref: 'dev' token: '${{ secrets.token }}' - name: 'Set up java 22' - uses: https://github.com/oracle-actions/setup-java@v1 + uses: https://github.com/actions/setup-java@v3 with: - website: oracle.com - release: 22 - version: 17.0.10 + java-version: "21" + distribution: "temurin" - name: "Setup maven" uses: https://github.com/s4u/setup-maven-action@v1.13.0 - name: Build with Maven -- 2.44.1 From acce7ba3cbcc9e82a06b559d9ec2c6df7d442eee Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Thu, 30 May 2024 06:06:43 +0200 Subject: [PATCH 15/17] wtf is happening --- .github/workflows/build_deploy_dev.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_deploy_dev.yml b/.github/workflows/build_deploy_dev.yml index a3441a4..823911f 100644 --- a/.github/workflows/build_deploy_dev.yml +++ b/.github/workflows/build_deploy_dev.yml @@ -20,10 +20,9 @@ jobs: - name: 'Set up java 22' uses: https://github.com/actions/setup-java@v3 with: - java-version: "21" + java-version: "22" distribution: "temurin" - - name: "Setup maven" - uses: https://github.com/s4u/setup-maven-action@v1.13.0 + - name: Build with Maven run: mvn -Dtoken=${{ secrets.token }} clean compile jib:build -e -- 2.44.1 From 1c7feef7dbf7bb15a0bc29d6847512f1adefc7bc Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Thu, 30 May 2024 06:09:14 +0200 Subject: [PATCH 16/17] actions: added maven back, but different thistime --- .github/workflows/build_deploy_dev.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build_deploy_dev.yml b/.github/workflows/build_deploy_dev.yml index 823911f..5f11fb3 100644 --- a/.github/workflows/build_deploy_dev.yml +++ b/.github/workflows/build_deploy_dev.yml @@ -23,6 +23,9 @@ jobs: 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.44.1 From 81393181272d51604e0bb196fd03d07c570b3f92 Mon Sep 17 00:00:00 2001 From: 4o1x5 <4o1x5@4o1x5.dev> Date: Thu, 30 May 2024 06:11:45 +0200 Subject: [PATCH 17/17] pom.xml: ci build failed due to wrong image being used to compile containers --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5bf23f8..a083ab6 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 3.4.2 - eclipse-temurin:21-jre + eclipse-temurin:22-jre