Combine steps back in different fashion

jfrog · Jul 8, 2024 · 3a62bee · 3a62bee
1 parent 9953892
commit 3a62bee
Showing 1 changed file with 11 additions and 19 deletions.
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -63,30 +63,22 @@ jobs:
         uses: goreleaser/goreleaser-action@v6
         with:
           install-only: true
-      - name: Create Artifactory data directories
-        run: |
-          mkdir -p ${{ runner.temp }}/artifactory/extra_conf
-          mkdir -p ${{ runner.temp }}/artifactory/var/etc
-          mkdir -p ${{ runner.temp }}/artifactory-2/extra_conf
-          mkdir -p ${{ runner.temp }}/artifactory-2/var/etc
-      - name: Set Join Key in system.yaml for artifactory
+      - name: Create Artifactory data directories and set Join Key in system.yaml for artifactory
+        env:
+          ARTIFACTORY_LICENSE: ${{ secrets.ARTIFACTORY_LICENSE }}
         uses: mikefarah/yq@master
         with:
           cmd: |
+            mkdir -p ${{ runner.temp }}/artifactory/extra_conf
+            mkdir -p ${{ runner.temp }}/artifactory/var/etc
+            mkdir -p ${{ runner.temp }}/artifactory-2/extra_conf
+            mkdir -p ${{ runner.temp }}/artifactory-2/var/etc
             cat ${{ github.workspace }}/scripts/system.yaml | yq '.shared += {"security": {"joinKey": "${{ secrets.ARTIFACTORY_JOIN_KEY }}"}}' > ${{ runner.temp }}/artifactory/var/etc/system.yaml
-      - name: Set Join Key in system.yaml for artifactory-2
-        uses: mikefarah/yq@master
-        with:
-          cmd: |
             cat ${{ github.workspace }}/scripts/system.yaml | yq '.shared += {"security": {"joinKey": "${{ secrets.ARTIFACTORY_JOIN_KEY }}"}}' > ${{ runner.temp }}/artifactory-2/var/etc/system.yaml
-      - name: Copy Artifactory install data
-        env:
-          ARTIFACTORY_LICENSE: ${{ secrets.ARTIFACTORY_LICENSE }}
-        run: |
-          echo $ARTIFACTORY_LICENSE > ${{ runner.temp }}/artifactory/extra_conf/artifactory.lic
-          sudo chown -R 1030:1030 ${{ runner.temp }}/artifactory/var
-          echo $ARTIFACTORY_LICENSE > ${{ runner.temp }}/artifactory-2/extra_conf/artifactory.lic
-          sudo chown -R 1030:1030 ${{ runner.temp }}/artifactory-2/var
+            echo $ARTIFACTORY_LICENSE > ${{ runner.temp }}/artifactory/extra_conf/artifactory.lic
+            sudo chown -R 1030:1030 ${{ runner.temp }}/artifactory/var
+            echo $ARTIFACTORY_LICENSE > ${{ runner.temp }}/artifactory-2/extra_conf/artifactory.lic
+            sudo chown -R 1030:1030 ${{ runner.temp }}/artifactory-2/var
       - name: Run Artifactory container
         id: run_artifactory_container
         run: |