preparing the ee repo for building v11

* Bump app version to 10.3.3-alpha.0

* use ubuntu 20

Revert "use ubuntu 20"

This reverts commit 7ccb64f88f6d85a16f7acc3e5b35709526bb0e02.

disable building ubuntu-22.04-arm

* update repo url

* Update package.json

* update license

From `Apache-2.0` to `Proprietary`

* enable merging git branch into develop

* enable configuring Git user

---------

Co-Authored-By: Jay Wu <130019718+notjaywu@users.noreply.github.com>

.github/workflows/release-build.yml

@@ -50,9 +50,9 @@ jobs:
           - os: ubuntu-22.04
             csc_link_secret: ''
             csc_key_password_secret: ''
-          - os: ubuntu-22.04-arm
-            csc_link_secret: ''
-            csc_key_password_secret: ''
+          # - os: ubuntu-22.04-arm
+          #   csc_link_secret: ''
+          #   csc_key_password_secret: ''
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4

.github/workflows/release-publish.yml

@@ -251,20 +251,20 @@ jobs:
       #       --package-type insomnia
       #       ${{ env.IS_PRERELEASE == 'true' && '--internal' || '--publish' }}
 
-      # - name: Configure Git user
-      #   uses: Homebrew/actions/git-user-config@master
-      #   with:
-      #     username: ${{ (github.event_name == 'workflow_dispatch' && github.actor) || 'insomnia-infra' }}
+      - name: Configure Git user
+        uses: Homebrew/actions/git-user-config@master
+        with:
+          username: ${{ (github.event_name == 'workflow_dispatch' && github.actor) || 'insomnia-infra' }}
 
-      # - name: Merge git branch into develop
-      #   run: |
-      #     remote_repo="https://${GITHUB_ACTOR}:${RELEASE_GH_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
-      #     git checkout develop
-      #     git merge --no-ff ${{ env.RELEASE_BRANCH }}
-      #     git status
-      #     git push "${remote_repo}"
-      #   env:
-      #     RELEASE_GH_TOKEN: ${{ secrets.RELEASE_GH_TOKEN }}
+      - name: Merge git branch into develop
+        run: |
+          remote_repo="https://${GITHUB_ACTOR}:${RELEASE_GH_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
+          git checkout develop
+          git merge --no-ff ${{ env.RELEASE_BRANCH }}
+          git status
+          git push "${remote_repo}"
+        env:
+          RELEASE_GH_TOKEN: ${{ secrets.RELEASE_GH_TOKEN }}
 
   artifact-provenance:
     needs: [publish]

.github/workflows/release-recurring.yml

@@ -32,8 +32,8 @@ jobs:
             build-targets: portable
           - os: ubuntu-22.04
             build-targets: tar.gz
-          - os: ubuntu-22.04-arm
-            build-targets: tar.gz
+          # - os: ubuntu-22.04-arm
+          #   build-targets: tar.gz
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4

package-lock.json

@@ -7,7 +7,7 @@
     "": {
       "name": "insomnia",
       "version": "1.0.0",
-      "license": "Apache-2.0",
+      "license": "Proprietary",
       "workspaces": [
         "packages/insomnia-testing",
         "packages/insomnia",

package.json

@@ -4,12 +4,12 @@
   "version": "1.0.0",
   "author": "Kong <office@konghq.com>",
   "description": "Insomnia is a cross-platform REST client, built on top of Electron.",
-  "license": "Apache-2.0",
-  "repository": "https://github.com/kong/insomnia",
+  "license": "Proprietary",
+  "repository": "https://github.com/kong/insomnia-ee",
   "bugs": {
-    "url": "https://github.com/kong/insomnia/issues"
+    "url": "https://github.com/kong/insomnia-ee/issues"
   },
-  "homepage": "https://github.com/kong/insomnia#readme",
+  "homepage": "https://github.com/kong/insomnia-ee#readme",
   "engines": {
     "node": ">=20.18.0 <22",
     "npm": ">=10"

packages/insomnia-inso/package.json

@@ -8,11 +8,11 @@
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Kong/insomnia.git",
+    "url": "git+https://github.com/Kong/insomnia-ee.git",
     "directory": "packages/insomnia-inso"
   },
   "bugs": {
-    "url": "https://github.com/kong/insomnia/issues"
+    "url": "https://github.com/kong/insomnia-ee/issues"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/insomnia-smoke-test/package.json

@@ -5,11 +5,11 @@
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Kong/insomnia.git",
+    "url": "git+https://github.com/Kong/insomnia-ee.git",
     "directory": "packages/insomnia-smoke-test"
   },
   "bugs": {
-    "url": "https://github.com/kong/insomnia/issues"
+    "url": "https://github.com/kong/insomnia-ee/issues"
   },
   "version": "11.0.0-beta.0",
   "scripts": {

packages/insomnia/package.json

@@ -6,11 +6,11 @@
   "description": "The Collaborative API Design Tool",
   "homepage": "https://konghq.com",
   "bugs": {
-    "url": "https://github.com/Kong/insomnia/issues"
+    "url": "https://github.com/Kong/insomnia-ee/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Kong/insomnia.git",
+    "url": "git+https://github.com/Kong/insomnia-ee.git",
     "directory": "packages/insomnia"
   },
   "license": "Apache-2.0",