Skip to content

Commit 3d62906

Browse files
saisatishkarrajackkav
authored andcommitted
fix gh review comments
1 parent 92759ab commit 3d62906

1 file changed

Lines changed: 8 additions & 10 deletions

File tree

.github/workflows/release-build.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ jobs:
3434
runs-on: ${{ matrix.os }}
3535
env:
3636
INSO_PACKAGE_NAME: insomnia-inso
37-
INSO_PACKAGE_WS_PATH: ./packages/insomnia-inso/
38-
INSO_PACKAGE_ARTIFACTS_PATH: ./packages/insomnia-inso/artifact
3937
INSO_DOCKER_TAR: inso-docker-image.tar
4038
strategy:
4139
fail-fast: false
@@ -86,7 +84,7 @@ jobs:
8684

8785
- name: Setup Inso CLI version env var
8886
run:
89-
echo "INSO_VERSION=$(jq .version ${{ env.INSO_PACKAGE_WS_PATH }}/package.json -rj)" >> $GITHUB_ENV
87+
echo "INSO_VERSION=$(jq .version ./packages/${{ env.INSO_PACKAGE_NAME }}/package.json -rj)" >> $GITHUB_ENV
9088

9189
- name: Package inso
9290
run: |
@@ -100,7 +98,7 @@ jobs:
10098
if: matrix.os == 'macos-13'
10199
run: ./src/scripts/macos-pkg.sh
102100
shell: bash
103-
working-directory: ${{ env.INSO_PACKAGE_WS_PATH }}
101+
working-directory: ./packages/${{ env.INSO_PACKAGE_NAME }}
104102
continue-on-error: false
105103
env:
106104
MACOS_CERTIFICATE: ${{ secrets.DESIGNER_MAC_CSC_LINK }}
@@ -113,7 +111,7 @@ jobs:
113111
if: matrix.os == 'macos-13'
114112
uses: lando/notarize-action@v2
115113
with:
116-
product-path: ${{ env.INSO_PACKAGE_ARTIFACTS_PATH }}/inso-${{ matrix.os }}-${{ env.INSO_VERSION }}.pkg
114+
product-path: ./packages/${{ env.INSO_PACKAGE_NAME }}/artifacts/inso-${{ matrix.os }}-${{ env.INSO_VERSION }}.pkg
117115
primary-bundle-id: com.insomnia.inso
118116
appstore-connect-username: ${{ secrets.DESIGNER_APPLE_ID }}
119117
appstore-connect-password: ${{ secrets.DESIGNER_APPLE_ID_PASSWORD }}
@@ -123,13 +121,13 @@ jobs:
123121
if: matrix.os == 'macos-13'
124122
uses: BoundfoxStudios/action-xcode-staple@v1
125123
with:
126-
product-path: ${{ env.INSO_PACKAGE_ARTIFACTS_PATH }}/inso-${{ matrix.os }}-${{ env.INSO_VERSION }}.pkg
124+
product-path: ./packages/${{ env.INSO_PACKAGE_NAME }}/artifacts/inso-${{ matrix.os }}-${{ env.INSO_VERSION }}.pkg
127125

128126
- name: Notarize Inso CLI binary (macOS only)
129127
if: matrix.os == 'macos-13'
130128
uses: lando/notarize-action@v2
131129
with:
132-
product-path: ${{ env.INSO_PACKAGE_WS_PATH }}/binaries/inso
130+
product-path: ./packages/${{ env.INSO_PACKAGE_NAME }}/binaries/inso
133131
primary-bundle-id: com.insomnia.inso-binary
134132
appstore-connect-username: ${{ secrets.DESIGNER_APPLE_ID }}
135133
appstore-connect-password: ${{ secrets.DESIGNER_APPLE_ID_PASSWORD }}
@@ -141,8 +139,8 @@ jobs:
141139
- name: Create inso Docker Image artifacts
142140
if: matrix.os == 'ubuntu-latest'
143141
run: |
144-
DOCKER_BUILDKIT=1 docker build --tag ${{ env.INSO_PACKAGE_NAME }}:temp ${{ env.INSO_PACKAGE_WS_PATH }}
145-
docker save ${{ env.INSO_PACKAGE_NAME }}:temp -o ${{ env.INSO_PACKAGE_ARTIFACTS_PATH }}/${{ env.INSO_DOCKER_TAR }}
142+
DOCKER_BUILDKIT=1 docker build --tag ${{ env.INSO_PACKAGE_NAME }}:temp ./packages/${{ env.INSO_PACKAGE_NAME }}
143+
docker save ${{ env.INSO_PACKAGE_NAME }}:temp -o ./packages/${{ env.INSO_PACKAGE_NAME }}/artifacts/${{ env.INSO_DOCKER_TAR }}
146144
147145
# Produce Docker SBOM for Inso Image
148146
# Automatically uploads to workflow assets
@@ -152,7 +150,7 @@ jobs:
152150
uses: Kong/public-shared-actions/security-actions/scan-docker-image@62643b74f79f6a697b9add1a2f9c069bf9ca1250 # v2.3.0
153151
with:
154152
asset_prefix: image-inso-${{ runner.os }}
155-
image: ${{ env.INSO_PACKAGE_ARTIFACTS_PATH }}/${{ env.INSO_DOCKER_TAR }}
153+
image: ./packages/${{ env.INSO_PACKAGE_NAME }}/artifacts/${{ env.INSO_DOCKER_TAR }}
156154
upload-sbom-release-assets: false # No release is publushed yet. Uploads as workflow assets
157155
env:
158156
SYFT_SOURCE_NAME: ${{ env.INSO_DOCKER_TAR }}

0 commit comments

Comments
 (0)