CI workflow fix: version not masked during publish

TouK · Jan 27, 2025 · 3d551c4 · 3d551c4
1 parent 0f1ccfb
commit 3d551c4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -527,9 +527,9 @@ jobs:
     uses: ./.github/workflows/publish.yml
     with:
       should_run: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/demo' || startsWith(github.ref, 'refs/heads/preview') || startsWith(github.ref, 'refs/heads/release') }}
-    secrets:
       nussknacker_version:  ${{ needs.setup.outputs.nk_snapshot_version }}
       git_source_branch: ${{ needs.setup.outputs.git_source_branch }}
+    secrets:
       sonatype_user: ${{ secrets.SONATYPE_USER }}
       sonatype_password: ${{ secrets.SONATYPE_PASSWORD }}
       github__token: ${{ secrets.GITHUB_TOKEN }}
@@ -541,10 +541,10 @@ jobs:
     needs: ['build', 'build-fe', 'setup']
     uses: ./.github/workflows/publish.yml
     with:
-      should_run: ${{ github.ref == 'refs/heads/staging' }}
-    secrets:
       nussknacker_version: ${{ needs.setup.outputs.nk_snapshot_version }}
       git_source_branch: ${{ needs.setup.outputs.git_source_branch }}
+      should_run: ${{ github.ref == 'refs/heads/staging' }}
+    secrets:
       sonatype_user: ${{ secrets.SONATYPE_USER }}
       sonatype_password: ${{ secrets.SONATYPE_PASSWORD }}
       github__token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -6,6 +6,14 @@ on:
         description: "Indicates if the job should be run"
         required: true
         type: boolean
+      nussknacker_version:
+        description: "Version that will be published"
+        required: true
+        type: string
+      git_source_branch:
+        description: "Source branch"
+        required: true
+        type: string
     secrets:
       nussknacker_version:
         required: true
@@ -29,8 +37,8 @@ jobs:
     env:
       nexusUrl: https://oss.sonatype.org/content/repositories/snapshots
       addDevArtifacts: true
-      NUSSKNACKER_VERSION: ${{ secrets.nussknacker_version }}
-      GIT_SOURCE_BRANCH: ${{ secrets.git_source_branch }}
+      NUSSKNACKER_VERSION: ${{ inputs.nussknacker_version }}
+      GIT_SOURCE_BRANCH: ${{ inputs.git_source_branch }}
       SONATYPE_USERNAME: ${{ secrets.sonatype_user }}
       SONATYPE_PASSWORD: ${{ secrets.sonatype_password }}
     steps: