another try

TouK · Jan 22, 2025 · c80d08a · c80d08a
1 parent f2be1de
commit c80d08a
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 18 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -528,8 +528,16 @@ jobs:
     uses: ./.github/workflows/publish.yml
     with:
       should_run: true
-      job_needs: "['build', 'build-fe', 'setup', 'tests', 'integrationTests', 'slowTests', 'frontendTests', 'cypressTests']"
-#    runs-on: ubuntu-latest
+#      job_needs: "['build', 'build-fe', 'setup', 'tests', 'integrationTests', 'slowTests', 'frontendTests', 'cypressTests']"
+    secrets:
+      nussknacker_version:  ${{ needs.setup.outputs.nk_snapshot_version }}
+      git_source_branch: ${{ needs.setup.outputs.git_source_branch }}
+      sonatype_user: ${{ secrets.SONATYPE_USER }}
+      sonatype_password: ${{ secrets.SONATYPE_PASSWORD }}
+      github_token: ${{ secrets.GITHUB_TOKEN }}
+      dockerhub_user: ${{ secrets.DOCKERHUB_USER }}
+      dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
+  #    runs-on: ubuntu-latest
 #    needs: ['build', 'build-fe', 'setup', 'tests', 'integrationTests', 'slowTests', 'frontendTests', 'cypressTests']
 #    if: ${{ github.ref != 'refs/heads/staging' }}
 #    uses: ./.github/workflows/publish.yml
@@ -546,7 +554,14 @@ jobs:
     uses: ./.github/workflows/publish.yml
     with:
       should_run: true
-      job_needs: "['build', 'build-fe', 'setup']"
+    secrets:
+      nussknacker_version: ${{ needs.setup.outputs.nk_snapshot_version }}
+      git_source_branch: ${{ needs.setup.outputs.git_source_branch }}
+      sonatype_user: ${{ secrets.SONATYPE_USER }}
+      sonatype_password: ${{ secrets.SONATYPE_PASSWORD }}
+      github_token: ${{ secrets.GITHUB_TOKEN }}
+      dockerhub_user: ${{ secrets.DOCKERHUB_USER }}
+      dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
 #    runs-on: ubuntu-latest
 #    needs: ['build', 'build-fe', 'setup']
     #if: ${{ github.ref == 'refs/heads/staging' }}

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -6,18 +6,24 @@ on:
         description: "Indicates if the job should be run"
         required: true
         type: boolean
-      job_needs:
-        description: "JSON list of jobs needed to run this workflow"
-        required: true
-        type: string
+#      job_needs:
+#        description: "JSON list of jobs needed to run this workflow"
+#        required: true
+#        type: string
     secrets:
-      SONATYPE_USER:
+      nussknacker_version:
+        required: true
+      git_source_branch:
+        required: true
+      sonatype_user:
+        required: true
+      sonatype_password:
         required: true
-      SONATYPE_PASSWORD:
+      github_token:
         required: true
-      DOCKERHUB_USER:
+      dockerhub_user:
         required: true
-      DOCKERHUB_TOKEN:
+      dockerhub_token:
         required: true
 
 jobs:
@@ -28,16 +34,16 @@ jobs:
     env:
       nexusUrl: https://oss.sonatype.org/content/repositories/snapshots
       addDevArtifacts: true
-      NUSSKNACKER_VERSION: ${{ needs.setup.outputs.nk_snapshot_version }}
-      GIT_SOURCE_BRANCH: ${{ needs.setup.outputs.git_source_branch }}
-      SONATYPE_USERNAME: ${{ secrets.SONATYPE_USER }}
-      SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+      NUSSKNACKER_VERSION: ${{ secrets.nussknacker_version }}
+      GIT_SOURCE_BRANCH: ${{ secrets.git_source_branch }}
+      SONATYPE_USERNAME: ${{ secrets.sonatype_user }}
+      SONATYPE_PASSWORD: ${{ secrets.sonatype_password }}
     steps:
       - name: Cancel previous runs
         if: github.event_name != 'push'
         uses: styfle/[email protected]
         with:
-          access_token: ${{ secrets.GITHUB_TOKEN }}
+          access_token: ${{ secrets.github_token }}
       - uses: actions/checkout@v3
       - uses: coursier/setup-action@v1
         with:
@@ -66,8 +72,8 @@ jobs:
       - name: Login to Docker Hub
         uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKERHUB_USER }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets.dockerhub_user }}
+          password: ${{ secrets.dockerhub_token }}
       - name: Setup buildx builder
         uses: docker/setup-buildx-action@v3
         with: