revert: pipeline changes

dyrector-io · Jan 6, 2025 · afdd27f · afdd27f
1 parent 5770bc5
commit afdd27f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/deploy_external.yaml b/.github/workflows/deploy_external.yaml
@@ -5,7 +5,7 @@ on:
     workflows:
       - 'product_builder'
     branches:
-      - 'feat/release-candidate'
+      - 'develop'
     types:
       - completed
 permissions:

diff --git a/.github/workflows/product_builder.yaml b/.github/workflows/product_builder.yaml
@@ -69,9 +69,9 @@ jobs:
       crux: ${{ steps.filter.outputs.crux }}
       cruxui: ${{ steps.filter.outputs.cruxui }}
       kratos: ${{ steps.filter.outputs.kratos }}
-      tag: "0.15.0-rc" # ${{ steps.settag.outputs.tag }}
+      tag: ${{ steps.settag.outputs.tag }}
       extratag: ${{ steps.settag.outputs.extratag }}
-      version: "0.15.0-rc" # ${{ steps.settag.outputs.version }}
+      version: ${{ steps.settag.outputs.version }}
       minorversion: ${{ steps.settag.outputs.minorversion }}
       release: ${{ steps.release.outputs.release }}
     steps:
@@ -669,10 +669,11 @@ jobs:
     defaults:
       run:
         working-directory: ${{ env.GOLANG_WORKING_DIRECTORY }}
-    needs: [gather_changes, go_build]
+    needs: [gather_changes, e2e]
     if: |
       always() &&
       (github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_type == 'tag') &&
+      needs.e2e.result == 'success' &&
       needs.go_build.result == 'success' &&
       (needs.crux_build.result == 'success' || needs.crux_build.result == 'skipped') &&
       (needs.crux-ui_build.result == 'success' || needs.crux-ui_build.result == 'skipped') &&
@@ -737,6 +738,7 @@ jobs:
     if: |
       always() &&
       (github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_type == 'tag') &&
+      needs.e2e.result == 'success' &&
       needs.go_build.result == 'success' &&
       (needs.crux_build.result == 'success' || needs.crux_build.result == 'skipped') &&
       (needs.crux-ui_build.result == 'success' || needs.crux-ui_build.result == 'skipped') &&
@@ -798,10 +800,11 @@ jobs:
     runs-on: ubuntu-22.04
     container:
       image: ghcr.io/dyrector-io/dyrectorio/builder-images/signer:2
-    needs: [crux_build, gather_changes]
+    needs: [crux_build, e2e, gather_changes]
     if: |
       always() &&
       (github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_type == 'tag') &&
+      needs.e2e.result == 'success' &&
       (needs.go_build.result == 'success' || needs.go_build.result == 'skipped') &&
       needs.crux_build.result == 'success' &&
       (needs.crux-ui_build.result == 'success' || needs.crux-ui_build.result == 'skipped') &&
@@ -860,10 +863,11 @@ jobs:
     runs-on: ubuntu-22.04
     container:
       image: ghcr.io/dyrector-io/dyrectorio/builder-images/signer:2
-    needs: [crux-ui_build, gather_changes]
+    needs: [crux-ui_build, e2e, gather_changes]
     if: |
       always() &&
       (github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_type == 'tag') &&
+      needs.e2e.result == 'success' &&
       (needs.go_build.result == 'success' || needs.go_build.result == 'skipped') &&
       (needs.crux_build.result == 'success' || needs.crux_build.result == 'skipped') &&
       needs.crux-ui_build.result == 'success' &&
@@ -922,10 +926,11 @@ jobs:
     runs-on: ubuntu-22.04
     container:
       image: ghcr.io/dyrector-io/dyrectorio/builder-images/signer:2
-    needs: [kratos_build, gather_changes]
+    needs: [kratos_build, e2e, gather_changes]
     if: |
       always() &&
       (github.ref_name == 'develop' || github.ref_name == 'main' || github.ref_type == 'tag') &&
+      needs.e2e.result == 'success' &&
       (needs.go_build.result == 'success' || needs.go_build.result == 'skipped') &&
       (needs.crux_build.result == 'success' || needs.crux_build.result == 'skipped') &&
       (needs.crux-ui_build.result == 'success' || needs.crux-ui_build.result == 'skipped') &&