fix gh review comments

Kong · Jun 3, 2024 · ebdcd67 · ebdcd67
1 parent 5bdc973
commit ebdcd67
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -34,8 +34,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       INSO_PACKAGE_NAME: insomnia-inso
-      INSO_PACKAGE_WS_PATH: ./packages/insomnia-inso/
-      INSO_PACKAGE_ARTIFACTS_PATH: ./packages/insomnia-inso/artifact
       INSO_DOCKER_TAR: inso-docker-image.tar
     strategy:
       fail-fast: false
@@ -84,7 +82,7 @@ jobs:
 
       - name: Setup Inso CLI version env var
         run:
-          echo "INSO_VERSION=$(jq .version ${{ env.INSO_PACKAGE_WS_PATH }}/package.json -rj)" >> $GITHUB_ENV
+          echo "INSO_VERSION=$(jq .version ./packages/${{ env.INSO_PACKAGE_NAME }}/package.json -rj)" >> $GITHUB_ENV
 
       - name: Package inso
         run: |
@@ -98,7 +96,7 @@ jobs:
         if: matrix.os == 'macos-latest'
         run: ./src/scripts/macos-pkg.sh
         shell: bash
-        working-directory: ${{ env.INSO_PACKAGE_WS_PATH }}
+        working-directory: ./packages/${{ env.INSO_PACKAGE_NAME }}
         continue-on-error: false
         env:
           MACOS_CERTIFICATE: ${{ secrets.DESIGNER_MAC_CSC_LINK }}
@@ -111,7 +109,7 @@ jobs:
         if: matrix.os == 'macos-latest'
         uses: lando/notarize-action@v2
         with:
-          product-path: ${{ env.INSO_PACKAGE_ARTIFACTS_PATH }}/inso-${{ matrix.os }}-${{ env.INSO_VERSION }}.pkg
+          product-path: ./packages/${{ env.INSO_PACKAGE_NAME }}/artifacts/inso-${{ matrix.os }}-${{ env.INSO_VERSION }}.pkg
           primary-bundle-id: com.insomnia.inso
           appstore-connect-username: ${{ secrets.DESIGNER_APPLE_ID }}
           appstore-connect-password: ${{ secrets.DESIGNER_APPLE_ID_PASSWORD }}
@@ -121,13 +119,13 @@ jobs:
         if: matrix.os == 'macos-latest'
         uses: BoundfoxStudios/action-xcode-staple@v1
         with:
-          product-path: ${{ env.INSO_PACKAGE_ARTIFACTS_PATH }}/inso-${{ matrix.os }}-${{ env.INSO_VERSION }}.pkg
+          product-path: ./packages/${{ env.INSO_PACKAGE_NAME }}/artifacts/inso-${{ matrix.os }}-${{ env.INSO_VERSION }}.pkg
 
       - name: Notarize Inso CLI binary (macOS only)
         if: matrix.os == 'macos-latest'
         uses: lando/notarize-action@v2
         with:
-          product-path: ${{ env.INSO_PACKAGE_WS_PATH }}/binaries/inso
+          product-path: ./packages/${{ env.INSO_PACKAGE_NAME }}/binaries/inso
           primary-bundle-id: com.insomnia.inso-binary
           appstore-connect-username: ${{ secrets.DESIGNER_APPLE_ID }}
           appstore-connect-password: ${{ secrets.DESIGNER_APPLE_ID_PASSWORD }}
@@ -139,8 +137,8 @@ jobs:
       - name: Create inso Docker Image artifacts
         if: matrix.os == 'ubuntu-latest'
         run: |
-          DOCKER_BUILDKIT=1 docker build --tag ${{ env.INSO_PACKAGE_NAME }}:temp ${{ env.INSO_PACKAGE_WS_PATH }}
-          docker save ${{ env.INSO_PACKAGE_NAME }}:temp -o ${{ env.INSO_PACKAGE_ARTIFACTS_PATH }}/${{ env.INSO_DOCKER_TAR }}
+          DOCKER_BUILDKIT=1 docker build --tag ${{ env.INSO_PACKAGE_NAME }}:temp ./packages/${{ env.INSO_PACKAGE_NAME }}
+          docker save ${{ env.INSO_PACKAGE_NAME }}:temp -o ./packages/${{ env.INSO_PACKAGE_NAME }}/artifacts/${{ env.INSO_DOCKER_TAR }}
       
       # Produce Docker SBOM for Inso Image
       # Automatically uploads to workflow assets
@@ -150,7 +148,7 @@ jobs:
         uses: Kong/public-shared-actions/security-actions/scan-docker-image@62643b74f79f6a697b9add1a2f9c069bf9ca1250 # v2.3.0
         with:
           asset_prefix: image-inso-${{ runner.os }}
-          image: ${{ env.INSO_PACKAGE_ARTIFACTS_PATH }}/${{ env.INSO_DOCKER_TAR }}
+          image: ./packages/${{ env.INSO_PACKAGE_NAME }}/artifacts/${{ env.INSO_DOCKER_TAR }}
           upload-sbom-release-assets: false # No release is publushed yet. Uploads as workflow assets
         env:
           SYFT_SOURCE_NAME: ${{ env.INSO_DOCKER_TAR }}