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>
This commit is contained in:
Insomnia
2025-02-20 11:55:00 +00:00
committed by Jay Wu
parent 9c2c5ff1fb
commit 4104c083ea
8 changed files with 29 additions and 29 deletions

View File

@@ -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

View File

@@ -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]

View File

@@ -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