Merge branch 'release/10.3.1-beta.1' into develop

Kong · Jan 28, 2025 · 00f4f8f · 00f4f8f
2 parents 0c7c50c + 9e38909
commit 00f4f8f
Show file tree

Hide file tree

Showing 14 changed files with 95 additions and 93 deletions.
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -12,7 +12,7 @@ concurrency:
 jobs:
   # shared kong github action for security checking
   generate-sbom-and-upload-assets:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     permissions:
       packages: write
       contents: write # publish sbom to GH releases/tag assets
@@ -47,10 +47,10 @@ jobs:
           - os: windows-latest
             csc_link_secret: ''
             csc_key_password_secret: ''
-          - os: ubuntu-24.04
+          - os: ubuntu-22.04
             csc_link_secret: ''
             csc_key_password_secret: ''
-          - os: ubuntu-24.04-arm
+          - os: ubuntu-22.04-arm
             csc_link_secret: ''
             csc_key_password_secret: ''
     steps:
@@ -71,13 +71,15 @@ jobs:
         run: |
           echo "INSO_VERSION=$(jq .version ./packages/${{ env.INSO_PACKAGE_NAME }}/package.json -rj)" >> $GITHUB_ENV
 
-      - name: Install snapcraft (Linux arm64 only)
-        if: runner.os == 'Linux' && runner.arch == 'arm64'
+      - name: Package app (Linux ARM64 only)
+        if: runner.os == 'Linux' && runner.arch == 'ARM64'
         shell: bash
-        run: sudo snap install snapcraft --classic 
+        run: BUILD_TARGETS='tar.gz' npm run app-package
+        env:
+          NODE_OPTIONS: '--max_old_space_size=6144'
 
-      - name: Package app (Linux only)
-        if: runner.os == 'Linux'
+      - name: Package app (Linux X64 only)
+        if: runner.os == 'Linux' && runner.arch == 'X64'
         shell: bash
         run: npm run app-package
         env:
@@ -200,7 +202,7 @@ jobs:
         run: npm run artifacts -w insomnia-inso
 
       - name: Create inso Docker Image artifacts
-        if: runner.os == 'Linux'
+        if: runner.os == 'Linux' && runner.arch == 'X64'
         run: |
           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 }}
@@ -209,7 +211,7 @@ jobs:
       # Automatically uploads to workflow assets
       - name: Scan inso docker artifacts
         id: sbom_action
-        if: runner.os == 'Linux'
+        if: runner.os == 'Linux' && runner.arch == 'X64'
         uses: Kong/public-shared-actions/security-actions/scan-docker-image@28d20a1f492927f35b00b317acd78f669c45f88b # v2.7.3
         with:
           asset_prefix: image-inso-${{ runner.os }}-${{ runner.arch }}
@@ -248,7 +250,7 @@ jobs:
   update-pull-request:
     timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }}
     needs: build-and-upload-release-artifacts
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Get release version
         id: release_version

diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
@@ -20,7 +20,7 @@ env:
 jobs:
   publish:
     timeout-minutes: 15
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     outputs:
       NOTARY_REPOSITORY: ${{ env.NOTARY_REPOSITORY }}
       INSO_BINARY_ARTIFACTS_SUBJECTS_AS_FILE: ${{ steps.cli_binary_hashes.outputs.handle }}

diff --git a/.github/workflows/release-recurring.yml b/.github/workflows/release-recurring.yml
@@ -30,9 +30,9 @@ jobs:
             build-targets: zip
           - os: windows-latest
             build-targets: portable
-          - os: ubuntu-24.04
+          - os: ubuntu-22.04
             build-targets: tar.gz
-          - os: ubuntu-24.04-arm
+          - os: ubuntu-22.04-arm
             build-targets: tar.gz
     steps:
       - name: Checkout branch

diff --git a/.github/workflows/release-start.yml b/.github/workflows/release-start.yml
@@ -19,7 +19,7 @@ on:
 jobs:
   setup-release-branch:
     timeout-minutes: 5
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4

diff --git a/.github/workflows/sast.yml b/.github/workflows/sast.yml
@@ -13,7 +13,7 @@ jobs:
   semgrep:
     timeout-minutes: 5
     name: Semgrep SAST
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     permissions:
       # required for all workflows
       security-events: write

diff --git a/.github/workflows/test-cli.yml b/.github/workflows/test-cli.yml
@@ -18,7 +18,7 @@ concurrency:
 jobs:
   Test:
     timeout-minutes: 10
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4
@@ -53,7 +53,7 @@ jobs:
         shell: bash
         run: |
           INSO_VERSION="$(jq .version packages/insomnia-inso/package.json -rj)-run.${{ github.run_number }}"
-          PKG_NAME="inso-ubuntu-24.04-$INSO_VERSION"
+          PKG_NAME="inso-ubuntu-22.04-$INSO_VERSION"
           echo "pkg-name=$PKG_NAME" >> $GITHUB_OUTPUT
           echo "inso-version=$INSO_VERSION" >> $GITHUB_OUTPUT
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ concurrency:
 jobs:
   Test:
     timeout-minutes: 20
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   update:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
 
     permissions:
       # Give the default GITHUB_TOKEN write permission to commit and push the

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/insomnia-inso/package.json b/packages/insomnia-inso/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "insomnia-inso",
-  "version": "10.3.1-beta.0",
+  "version": "10.3.1-beta.1",
   "homepage": "https://insomnia.rest",
   "description": "A CLI for Insomnia - The Collaborative API Design Tool",
   "author": "Kong <[email protected]>",

diff --git a/packages/insomnia-sdk/package.json b/packages/insomnia-sdk/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "insomnia-sdk",
-  "version": "10.3.1-beta.0",
+  "version": "10.3.1-beta.1",
   "description": "",
   "main": "src/objects/index.ts",
   "types": "src/objects/index.ts",

diff --git a/packages/insomnia-smoke-test/package.json b/packages/insomnia-smoke-test/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/kong/insomnia/issues"
   },
-  "version": "10.3.1-beta.0",
+  "version": "10.3.1-beta.1",
   "scripts": {
     "test:dev": "xvfb-maybe cross-env BUNDLE=dev playwright test",
     "test:build": "xvfb-maybe cross-env BUNDLE=build playwright test",

diff --git a/packages/insomnia-testing/package.json b/packages/insomnia-testing/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "name": "insomnia-testing",
   "license": "Apache-2.0",
-  "version": "10.3.1-beta.0",
+  "version": "10.3.1-beta.1",
   "author": "Kong <[email protected]>",
   "repository": {
     "type": "git",

diff --git a/packages/insomnia/package.json b/packages/insomnia/package.json
@@ -1,6 +1,6 @@
 {
   "name": "insomnia",
-  "version": "10.3.1-beta.0",
+  "version": "10.3.1-beta.1",
   "productName": "Insomnia",
   "private": true,
   "description": "The Collaborative API Design Tool",