Fix build-sample-apps artifactory deploy (take 2)

Author: onobc

.github/actions/build-sample-app/action.yml

@@ -12,6 +12,10 @@ inputs:
  description: 'whether or not to publish to artifactory'
  required: false
  default: 'false'
+ jf-server-id:
+ description: 'JFrog server id'
+ required: false
+ default: 'github-spring-cloud'
  jf-artifactory-spring:
  description: 'encoded JFrog server id configuration'
  required: false
@@ -75,6 +79,7 @@ runs:
  if: ${{ inputs.artifactory-publish == 'true' }}
  with:
  app-dir: ${{ inputs.app-dir }}
+ jf-server-id: ${{ inputs.jf-server-id }}
  jf-artifactory-spring: ${{ inputs.jf-artifactory-spring }}
  jf-mvn-build-commands: ${{ inputs.jf-mvn-build-commands }}
  artifactory-repo-deploy-snapshots: ${{ inputs.artifactory-repo-deploy-snapshots }}

.github/actions/build-sample-app/artifactory-publish/action.yml

@@ -4,6 +4,9 @@ inputs:
  app-dir:
  description: 'relative path to the app directory'
  required: true
+ jf-server-id:
+ description: 'JFrog server id'
+ required: true
  jf-artifactory-spring:
  description: 'encoded JFrog server id configuration'
  required: true
@@ -29,10 +32,11 @@ runs:
  JF_ARTIFACTORY_SPRING: ${{ inputs.JF_ARTIFACTORY_SPRING }}
 
  - name: Configure JFrog Cli
+ shell: bash
  run: |
  jfrog mvnc --use-wrapper \
- --server-id-resolve=${{ vars.JF_SERVER_ID }} \
- --server-id-deploy=${{ vars.JF_SERVER_ID }} \
+ --server-id-resolve=${{ inputs.jf-server-id }} \
+ --server-id-deploy=${{ inputs.jf-server-id }} \
  --repo-resolve-releases=libs-milestone \
  --repo-resolve-snapshots=libs-snapshot \
  --repo-deploy-releases=${{ inputs.artifactory-repo-deploy-releases }} \

.github/workflows/ci-task-3.yml

@@ -50,6 +50,7 @@ jobs:
  app-dir: 'timestamp-task-3'
  mvn-build-commands: '-B clean install spring-boot:build-image'
  artifactory-publish: ${{ inputs.maven-build-only != true }}
+ jf-server-id: ${{ vars.JF_SERVER_ID }}
  jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
  artifactory-repo-deploy-releases: 'libs-milestone-local'
  docker-push: ${{ inputs.maven-build-only != true }}
@@ -75,6 +76,7 @@ jobs:
  app-dir: 'timestamp-batch-3'
  mvn-build-commands: '-B clean install spring-boot:build-image'
  artifactory-publish: ${{ inputs.maven-build-only != true }}
+ jf-server-id: ${{ vars.JF_SERVER_ID }}
  jf-artifactory-spring: ${{ secrets.JF_ARTIFACTORY_SPRING }}
  artifactory-repo-deploy-releases: 'libs-milestone-local'
  docker-push: ${{ inputs.maven-build-only != true }}