From 34a637ede4198f9ef47e5a4f242be927113f0953 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter <14137977+simonhir@users.noreply.github.com> Date: Thu, 28 Nov 2024 15:41:23 +0100 Subject: [PATCH 1/2] Bug/fix ci (#290) * :bug: ci build all fix boolean compare * :poop: try ci fix build image integration * :poop: try ci fix build image integration * Revert ":poop: try ci fix build image integration" This reverts commit 9f3f6b28d8271fdd1e80cdb471158bfbad0b700f. * Revert ":poop: try ci fix build image integration" This reverts commit 57a5806171ea3f5725d46a225486140f84fbe66e. * :poop: try ci fix build image integration * :poop: try ci fix build image integration * :poop: try ci fix build image integration * :poop: try ci fix build image integration * :poop: ci fix build image integration * :bookmark: revert ci fix tests --- .github/workflows/build_integrations.yaml | 2 +- .github/workflows/maven_node_build.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_integrations.yaml b/.github/workflows/build_integrations.yaml index d5f2ab9e..68f8f911 100644 --- a/.github/workflows/build_integrations.yaml +++ b/.github/workflows/build_integrations.yaml @@ -36,7 +36,7 @@ jobs: registry-username: ${{ github.actor }} registry-password: ${{ secrets.GITHUB_TOKEN }} path: ${{ matrix.path }} - artifact-name: ${{ needs.release-maven.outputs.ARTIFACT_NAME }} + artifact-name: ${{ needs.build-maven.outputs.ARTIFACT_NAME }} image-name: ${{ matrix.name }} image-tags: | type=raw,value=dev diff --git a/.github/workflows/maven_node_build.yaml b/.github/workflows/maven_node_build.yaml index d8731faf..ce24f88f 100644 --- a/.github/workflows/maven_node_build.yaml +++ b/.github/workflows/maven_node_build.yaml @@ -30,7 +30,7 @@ jobs: uses: it-at-m/.github/.github/actions/action-maven-build@main with: app-path: "${{ matrix.app-path }}" - - if: github.ref == 'refs/heads/main' && matrix.build-image != 'false' + - if: github.ref == 'refs/heads/main' && matrix.build-image != false uses: it-at-m/.github/.github/actions/action-build-image@main with: path: "${{ matrix.app-path }}" From d145273fece607e422b36c496ef02401f4c30be7 Mon Sep 17 00:00:00 2001 From: Simon Hirtreiter <14137977+simonhir@users.noreply.github.com> Date: Thu, 28 Nov 2024 16:00:02 +0100 Subject: [PATCH 2/2] Bug/fix ci image build (#293) * :bug: ci fix build-all image build if * :alembic: test ci build images on every branch * Revert ":alembic: test ci build images on every branch" This reverts commit 45a5c474e3d6df71d7db61311b75b18193d2fa25. --- .github/workflows/maven_node_build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven_node_build.yaml b/.github/workflows/maven_node_build.yaml index ce24f88f..7b0a299f 100644 --- a/.github/workflows/maven_node_build.yaml +++ b/.github/workflows/maven_node_build.yaml @@ -16,6 +16,7 @@ jobs: matrix: include: # paths of different modules - app-path: refarch-gateway + build-image: true - app-path: refarch-tools/refarch-java-tools build-image: false steps: @@ -30,7 +31,7 @@ jobs: uses: it-at-m/.github/.github/actions/action-maven-build@main with: app-path: "${{ matrix.app-path }}" - - if: github.ref == 'refs/heads/main' && matrix.build-image != false + - if: github.ref == 'refs/heads/main' && matrix.build-image uses: it-at-m/.github/.github/actions/action-build-image@main with: path: "${{ matrix.app-path }}"