Feat Jan beta version (#3835)
* feat: add beta version --------- Co-authored-by: Hien To <tominhhien97@gmail.com>
This commit is contained in:
parent
53098699ef
commit
9045eeb1d6
47
.github/scripts/rename-app-beta.sh
vendored
Normal file
47
.github/scripts/rename-app-beta.sh
vendored
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Check if the correct number of arguments is provided
|
||||||
|
if [ "$#" -ne 1 ]; then
|
||||||
|
echo "Usage: $0 <path_to_json_input_file>"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
INPUT_JSON_FILE="$1"
|
||||||
|
|
||||||
|
# Check if the input file exists
|
||||||
|
if [ ! -f "$INPUT_JSON_FILE" ]; then
|
||||||
|
echo "Input file not found: $INPUT_JSON_FILE"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Use jq to transform the content
|
||||||
|
jq '
|
||||||
|
.name = "jan-beta" |
|
||||||
|
.productName = "Jan-beta" |
|
||||||
|
.build.appId = "jan-beta.ai.app" |
|
||||||
|
.build.productName = "Jan-beta" |
|
||||||
|
.build.appId = "jan-beta.ai.app" |
|
||||||
|
.build.protocols[0].name = "Jan-beta" |
|
||||||
|
.build.protocols[0].schemes = ["jan-beta"] |
|
||||||
|
.build.artifactName = "jan-beta-${os}-${arch}-${version}.${ext}" |
|
||||||
|
.build.publish[0].channel = "beta"
|
||||||
|
' "$INPUT_JSON_FILE" > ./package.json.tmp
|
||||||
|
|
||||||
|
cat ./package.json.tmp
|
||||||
|
|
||||||
|
rm $INPUT_JSON_FILE
|
||||||
|
mv ./package.json.tmp $INPUT_JSON_FILE
|
||||||
|
|
||||||
|
# Update the layout file
|
||||||
|
LAYOUT_FILE_PATH="web/app/layout.tsx"
|
||||||
|
|
||||||
|
if [ ! -f "$LAYOUT_FILE_PATH" ]; then
|
||||||
|
echo "File does not exist: $LAYOUT_FILE_PATH"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Perform the replacements
|
||||||
|
sed -i -e "s#Jan#Jan-beta#g" "$LAYOUT_FILE_PATH"
|
||||||
|
|
||||||
|
# Notify completion
|
||||||
|
echo "File has been updated: $LAYOUT_FILE_PATH"
|
||||||
16
.github/scripts/rename-uninstaller-beta.sh
vendored
Normal file
16
.github/scripts/rename-uninstaller-beta.sh
vendored
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# File path to be modified
|
||||||
|
FILE_PATH="electron/scripts/uninstaller.nsh"
|
||||||
|
|
||||||
|
# Check if the file exists
|
||||||
|
if [ ! -f "$FILE_PATH" ]; then
|
||||||
|
echo "File does not exist: $FILE_PATH"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Perform the replacements
|
||||||
|
sed -i -e "s#jan#jan-beta#g" "$FILE_PATH"
|
||||||
|
|
||||||
|
# Notify completion
|
||||||
|
echo "File has been updated: $FILE_PATH"
|
||||||
16
.github/scripts/rename-workspace-beta.sh
vendored
Normal file
16
.github/scripts/rename-workspace-beta.sh
vendored
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# File path to be modified
|
||||||
|
FILE_PATH="$1"
|
||||||
|
|
||||||
|
# Check if the file exists
|
||||||
|
if [ ! -f "$FILE_PATH" ]; then
|
||||||
|
echo "File does not exist: $FILE_PATH"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Perform the replacements
|
||||||
|
sed -i -e 's/yarn workspace jan/yarn workspace jan-beta/g' "$FILE_PATH"
|
||||||
|
|
||||||
|
# Notify completion
|
||||||
|
echo "File has been updated: $FILE_PATH"
|
||||||
136
.github/workflows/jan-electron-build-beta.yml
vendored
Normal file
136
.github/workflows/jan-electron-build-beta.yml
vendored
Normal file
@ -0,0 +1,136 @@
|
|||||||
|
name: Electron Builder - Beta Build
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags: ["v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+-beta"]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
# Job create Update app version based on latest release tag with build number and save to output
|
||||||
|
get-update-version:
|
||||||
|
uses: ./.github/workflows/template-get-update-version.yml
|
||||||
|
|
||||||
|
create-draft-release:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
|
||||||
|
outputs:
|
||||||
|
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||||
|
version: ${{ steps.get_version.outputs.version }}
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
steps:
|
||||||
|
- name: Extract tag name without v prefix
|
||||||
|
id: get_version
|
||||||
|
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV && echo "::set-output name=version::${GITHUB_REF#refs/tags/v}"
|
||||||
|
env:
|
||||||
|
GITHUB_REF: ${{ github.ref }}
|
||||||
|
- name: Create Draft Release
|
||||||
|
id: create_release
|
||||||
|
uses: softprops/action-gh-release@v2
|
||||||
|
with:
|
||||||
|
tag_name: ${{ github.ref_name }}
|
||||||
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
name: "${{ env.VERSION }}"
|
||||||
|
draft: true
|
||||||
|
prerelease: false
|
||||||
|
generate_release_notes: true
|
||||||
|
|
||||||
|
build-macos-x64:
|
||||||
|
uses: ./.github/workflows/template-build-macos-x64.yml
|
||||||
|
secrets: inherit
|
||||||
|
needs: [get-update-version]
|
||||||
|
with:
|
||||||
|
ref: ${{ github.ref }}
|
||||||
|
public_provider: github
|
||||||
|
new_version: ${{ needs.get-update-version.outputs.new_version }}
|
||||||
|
beta: true
|
||||||
|
|
||||||
|
build-macos-arm64:
|
||||||
|
uses: ./.github/workflows/template-build-macos-arm64.yml
|
||||||
|
secrets: inherit
|
||||||
|
needs: [get-update-version]
|
||||||
|
with:
|
||||||
|
ref: ${{ github.ref }}
|
||||||
|
public_provider: github
|
||||||
|
new_version: ${{ needs.get-update-version.outputs.new_version }}
|
||||||
|
beta: true
|
||||||
|
|
||||||
|
build-windows-x64:
|
||||||
|
uses: ./.github/workflows/template-build-windows-x64.yml
|
||||||
|
secrets: inherit
|
||||||
|
needs: [get-update-version]
|
||||||
|
with:
|
||||||
|
ref: ${{ github.ref }}
|
||||||
|
public_provider: github
|
||||||
|
new_version: ${{ needs.get-update-version.outputs.new_version }}
|
||||||
|
beta: true
|
||||||
|
|
||||||
|
build-linux-x64:
|
||||||
|
uses: ./.github/workflows/template-build-linux-x64.yml
|
||||||
|
secrets: inherit
|
||||||
|
needs: [get-update-version]
|
||||||
|
with:
|
||||||
|
ref: ${{ github.ref }}
|
||||||
|
public_provider: github
|
||||||
|
new_version: ${{ needs.get-update-version.outputs.new_version }}
|
||||||
|
beta: true
|
||||||
|
|
||||||
|
combine-beta-mac-yml:
|
||||||
|
needs: [build-macos-x64, build-macos-arm64, create-draft-release, build-windows-x64, build-linux-x64]
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
steps:
|
||||||
|
- name: Getting the repo
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
|
- name: Download mac-x64 artifacts
|
||||||
|
uses: actions/download-artifact@v4
|
||||||
|
with:
|
||||||
|
name: beta-mac-x64
|
||||||
|
path: ./beta-mac-x64
|
||||||
|
- name: Download mac-arm artifacts
|
||||||
|
uses: actions/download-artifact@v4
|
||||||
|
with:
|
||||||
|
name: beta-mac-arm64
|
||||||
|
path: ./beta-mac-arm64
|
||||||
|
|
||||||
|
- name: 'Merge beta-mac.yml'
|
||||||
|
# unfortunately electron-builder doesn't understand that we have two different releases for mac-x64 and mac-arm, so we need to manually merge the latest files
|
||||||
|
# see https://github.com/electron-userland/electron-builder/issues/5592
|
||||||
|
run: |
|
||||||
|
ls -la .
|
||||||
|
ls -la ./beta-mac-x64
|
||||||
|
ls -la ./beta-mac-arm64
|
||||||
|
ls -la ./electron
|
||||||
|
cp ./electron/merge-latest-ymls.js /tmp/merge-beta-ymls.js
|
||||||
|
npm install js-yaml --prefix /tmp
|
||||||
|
node /tmp/merge-beta-ymls.js ./beta-mac-x64/beta-mac.yml ./beta-mac-arm64/beta-mac.yml ./beta-mac.yml
|
||||||
|
cat ./beta-mac.yml
|
||||||
|
|
||||||
|
- name: Yet Another Upload Release Asset Action
|
||||||
|
uses: shogo82148/actions-upload-release-asset@v1.7.2
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
with:
|
||||||
|
upload_url: ${{ needs.create-draft-release.outputs.upload_url }}
|
||||||
|
asset_path: ./beta-mac.yml
|
||||||
|
asset_name: beta-mac.yml
|
||||||
|
asset_content_type: text/yaml
|
||||||
|
overwrite: true
|
||||||
|
|
||||||
|
- name: Upload beta-mac.yml
|
||||||
|
run: |
|
||||||
|
aws s3 cp ./beta-mac.yml "s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/temp-beta/beta-mac.yml"
|
||||||
|
# sync temp-beta to beta by copy files that are different or new
|
||||||
|
aws s3 sync "s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/temp-beta/" "s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/beta/"
|
||||||
|
env:
|
||||||
|
AWS_ACCESS_KEY_ID: ${{ secrets.DELTA_AWS_ACCESS_KEY_ID }}
|
||||||
|
AWS_SECRET_ACCESS_KEY: ${{ secrets.DELTA_AWS_SECRET_ACCESS_KEY }}
|
||||||
|
AWS_DEFAULT_REGION: ${{ secrets.DELTA_AWS_REGION }}
|
||||||
|
AWS_EC2_METADATA_DISABLED: "true"
|
||||||
|
|
||||||
|
- name: set release to prerelease
|
||||||
|
run: |
|
||||||
|
gh release edit v${{ needs.create-draft-release.outputs.version }} --draft=false --prerelease
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
@ -80,7 +80,7 @@ jobs:
|
|||||||
new_version: ${{ needs.get-update-version.outputs.new_version }}
|
new_version: ${{ needs.get-update-version.outputs.new_version }}
|
||||||
|
|
||||||
combine-latest-mac-yml:
|
combine-latest-mac-yml:
|
||||||
needs: [set-public-provider, build-macos-x64, build-macos-arm64]
|
needs: [set-public-provider, build-macos-x64, build-macos-arm64, build-windows-x64, build-linux-x64]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Getting the repo
|
- name: Getting the repo
|
||||||
@ -114,7 +114,8 @@ jobs:
|
|||||||
- name: Upload latest-mac.yml
|
- name: Upload latest-mac.yml
|
||||||
if: ${{ needs.set-public-provider.outputs.public_provider == 'aws-s3' }}
|
if: ${{ needs.set-public-provider.outputs.public_provider == 'aws-s3' }}
|
||||||
run: |
|
run: |
|
||||||
aws s3 cp ./latest-mac.yml "s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/latest/latest-mac.yml"
|
aws s3 cp ./latest-mac.yml "s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/temp-latest/latest-mac.yml"
|
||||||
|
aws s3 sync s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/temp-latest/ s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/latest/
|
||||||
env:
|
env:
|
||||||
AWS_ACCESS_KEY_ID: ${{ secrets.DELTA_AWS_ACCESS_KEY_ID }}
|
AWS_ACCESS_KEY_ID: ${{ secrets.DELTA_AWS_ACCESS_KEY_ID }}
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.DELTA_AWS_SECRET_ACCESS_KEY }}
|
AWS_SECRET_ACCESS_KEY: ${{ secrets.DELTA_AWS_SECRET_ACCESS_KEY }}
|
||||||
|
|||||||
39
.github/workflows/template-build-linux-x64.yml
vendored
39
.github/workflows/template-build-linux-x64.yml
vendored
@ -19,6 +19,10 @@ on:
|
|||||||
required: false
|
required: false
|
||||||
type: string
|
type: string
|
||||||
default: '/latest/'
|
default: '/latest/'
|
||||||
|
beta:
|
||||||
|
required: false
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
secrets:
|
secrets:
|
||||||
DELTA_AWS_S3_BUCKET_NAME:
|
DELTA_AWS_S3_BUCKET_NAME:
|
||||||
required: false
|
required: false
|
||||||
@ -56,17 +60,29 @@ jobs:
|
|||||||
mv /tmp/package.json electron/package.json
|
mv /tmp/package.json electron/package.json
|
||||||
jq --arg version "${{ inputs.new_version }}" '.version = $version' web/package.json > /tmp/package.json
|
jq --arg version "${{ inputs.new_version }}" '.version = $version' web/package.json > /tmp/package.json
|
||||||
mv /tmp/package.json web/package.json
|
mv /tmp/package.json web/package.json
|
||||||
jq '.build.publish = [{"provider": "generic", "url": "${{ secrets.CLOUDFLARE_R2_PUBLIC_URL }}", "channel": "latest"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "${{ inputs.aws_s3_prefix }}", "channel": "latest"}]' electron/package.json > /tmp/package.json
|
jq '.build.publish = [{"provider": "generic", "url": "${{ secrets.CLOUDFLARE_R2_PUBLIC_URL }}", "channel": "latest"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "temp-latest", "channel": "latest"}]' electron/package.json > /tmp/package.json
|
||||||
|
mv /tmp/package.json electron/package.json
|
||||||
|
cat electron/package.json
|
||||||
|
|
||||||
|
- name: Change App Name for beta version
|
||||||
|
if: inputs.beta == true
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
chmod +x .github/scripts/rename-app-beta.sh
|
||||||
|
.github/scripts/rename-app-beta.sh ./electron/package.json
|
||||||
|
chmod +x .github/scripts/rename-workspace-beta.sh
|
||||||
|
.github/scripts/rename-workspace-beta.sh ./package.json
|
||||||
|
echo "------------------------"
|
||||||
|
cat ./electron/package.json
|
||||||
|
echo "------------------------"
|
||||||
|
cat ./package.json
|
||||||
|
jq '.build.publish = [{"provider": "generic", "url": "https://delta.jan.ai/beta", "channel": "beta"}, {"provider": "github", "owner": "janhq", "repo": "jan", "channel": "beta"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "temp-beta", "channel": "beta"}]' electron/package.json > /tmp/package.json
|
||||||
mv /tmp/package.json electron/package.json
|
mv /tmp/package.json electron/package.json
|
||||||
cat electron/package.json
|
cat electron/package.json
|
||||||
|
|
||||||
- name: Update app version base on tag
|
- name: Update app version base on tag
|
||||||
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github'
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github'
|
||||||
run: |
|
run: |
|
||||||
if [[ ! "${VERSION_TAG}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
|
||||||
echo "Error: Tag is not valid!"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
jq --arg version "${VERSION_TAG#v}" '.version = $version' electron/package.json > /tmp/package.json
|
jq --arg version "${VERSION_TAG#v}" '.version = $version' electron/package.json > /tmp/package.json
|
||||||
mv /tmp/package.json electron/package.json
|
mv /tmp/package.json electron/package.json
|
||||||
jq --arg version "${VERSION_TAG#v}" '.version = $version' web/package.json > /tmp/package.json
|
jq --arg version "${VERSION_TAG#v}" '.version = $version' web/package.json > /tmp/package.json
|
||||||
@ -92,7 +108,7 @@ jobs:
|
|||||||
AWS_MAX_ATTEMPTS: "5"
|
AWS_MAX_ATTEMPTS: "5"
|
||||||
|
|
||||||
- name: Build and publish app to github
|
- name: Build and publish app to github
|
||||||
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github'
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github' && inputs.beta == false
|
||||||
run: |
|
run: |
|
||||||
make build-and-publish
|
make build-and-publish
|
||||||
env:
|
env:
|
||||||
@ -100,6 +116,17 @@ jobs:
|
|||||||
ANALYTICS_ID: ${{ secrets.JAN_APP_UMAMI_PROJECT_API_KEY }}
|
ANALYTICS_ID: ${{ secrets.JAN_APP_UMAMI_PROJECT_API_KEY }}
|
||||||
ANALYTICS_HOST: ${{ secrets.JAN_APP_UMAMI_URL }}
|
ANALYTICS_HOST: ${{ secrets.JAN_APP_UMAMI_URL }}
|
||||||
|
|
||||||
|
- name: Build and publish app to github
|
||||||
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github' && inputs.beta == true
|
||||||
|
run: |
|
||||||
|
make build-and-publish
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
AWS_ACCESS_KEY_ID: ${{ secrets.DELTA_AWS_ACCESS_KEY_ID }}
|
||||||
|
AWS_SECRET_ACCESS_KEY: ${{ secrets.DELTA_AWS_SECRET_ACCESS_KEY }}
|
||||||
|
AWS_EC2_METADATA_DISABLED: "true"
|
||||||
|
AWS_MAX_ATTEMPTS: "5"
|
||||||
|
|
||||||
- name: Upload Artifact .deb file
|
- name: Upload Artifact .deb file
|
||||||
if: inputs.public_provider != 'github'
|
if: inputs.public_provider != 'github'
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
|
|||||||
57
.github/workflows/template-build-macos-arm64.yml
vendored
57
.github/workflows/template-build-macos-arm64.yml
vendored
@ -19,6 +19,10 @@ on:
|
|||||||
required: false
|
required: false
|
||||||
type: string
|
type: string
|
||||||
default: '/latest/'
|
default: '/latest/'
|
||||||
|
beta:
|
||||||
|
required: false
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
secrets:
|
secrets:
|
||||||
DELTA_AWS_S3_BUCKET_NAME:
|
DELTA_AWS_S3_BUCKET_NAME:
|
||||||
required: false
|
required: false
|
||||||
@ -68,7 +72,7 @@ jobs:
|
|||||||
jq --arg version "${{ inputs.new_version }}" '.version = $version' web/package.json > /tmp/package.json
|
jq --arg version "${{ inputs.new_version }}" '.version = $version' web/package.json > /tmp/package.json
|
||||||
mv /tmp/package.json web/package.json
|
mv /tmp/package.json web/package.json
|
||||||
|
|
||||||
jq '.build.publish = [{"provider": "generic", "url": "${{ secrets.CLOUDFLARE_R2_PUBLIC_URL }}", "channel": "latest"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "${{ inputs.aws_s3_prefix }}", "channel": "latest"}]' electron/package.json > /tmp/package.json
|
jq '.build.publish = [{"provider": "generic", "url": "${{ secrets.CLOUDFLARE_R2_PUBLIC_URL }}", "channel": "latest"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "temp-latest", "channel": "latest"}]' electron/package.json > /tmp/package.json
|
||||||
mv /tmp/package.json electron/package.json
|
mv /tmp/package.json electron/package.json
|
||||||
|
|
||||||
jq --arg teamid "${{ secrets.APPLE_TEAM_ID }}" '.build.mac.notarize.teamId = $teamid' electron/package.json > /tmp/package.json
|
jq --arg teamid "${{ secrets.APPLE_TEAM_ID }}" '.build.mac.notarize.teamId = $teamid' electron/package.json > /tmp/package.json
|
||||||
@ -76,13 +80,25 @@ jobs:
|
|||||||
|
|
||||||
cat electron/package.json
|
cat electron/package.json
|
||||||
|
|
||||||
|
- name: Change App Name for beta version
|
||||||
|
if: inputs.beta == true
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
chmod +x .github/scripts/rename-app-beta.sh
|
||||||
|
.github/scripts/rename-app-beta.sh ./electron/package.json
|
||||||
|
chmod +x .github/scripts/rename-workspace-beta.sh
|
||||||
|
.github/scripts/rename-workspace-beta.sh ./package.json
|
||||||
|
echo "------------------------"
|
||||||
|
cat ./electron/package.json
|
||||||
|
echo "------------------------"
|
||||||
|
cat ./package.json
|
||||||
|
jq '.build.publish = [{"provider": "generic", "url": "https://delta.jan.ai/beta", "channel": "beta"}, {"provider": "github", "owner": "janhq", "repo": "jan", "channel": "beta"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "temp-beta", "channel": "beta"}]' electron/package.json > /tmp/package.json
|
||||||
|
mv /tmp/package.json electron/package.json
|
||||||
|
cat electron/package.json
|
||||||
|
|
||||||
- name: Update app version base on tag
|
- name: Update app version base on tag
|
||||||
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github'
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github'
|
||||||
run: |
|
run: |
|
||||||
if [[ ! "${VERSION_TAG}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
|
||||||
echo "Error: Tag is not valid!"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
jq --arg version "${VERSION_TAG#v}" '.version = $version' electron/package.json > /tmp/package.json
|
jq --arg version "${VERSION_TAG#v}" '.version = $version' electron/package.json > /tmp/package.json
|
||||||
mv /tmp/package.json electron/package.json
|
mv /tmp/package.json electron/package.json
|
||||||
jq --arg version "${VERSION_TAG#v}" '.version = $version' web/package.json > /tmp/package.json
|
jq --arg version "${VERSION_TAG#v}" '.version = $version' web/package.json > /tmp/package.json
|
||||||
@ -131,7 +147,7 @@ jobs:
|
|||||||
AWS_MAX_ATTEMPTS: "5"
|
AWS_MAX_ATTEMPTS: "5"
|
||||||
|
|
||||||
- name: Build and publish app to github
|
- name: Build and publish app to github
|
||||||
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github'
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github' && inputs.beta == false
|
||||||
run: |
|
run: |
|
||||||
make build-and-publish
|
make build-and-publish
|
||||||
env:
|
env:
|
||||||
@ -146,6 +162,25 @@ jobs:
|
|||||||
ANALYTICS_ID: ${{ secrets.JAN_APP_UMAMI_PROJECT_API_KEY }}
|
ANALYTICS_ID: ${{ secrets.JAN_APP_UMAMI_PROJECT_API_KEY }}
|
||||||
ANALYTICS_HOST: ${{ secrets.JAN_APP_UMAMI_URL }}
|
ANALYTICS_HOST: ${{ secrets.JAN_APP_UMAMI_URL }}
|
||||||
|
|
||||||
|
- name: Build and publish app to github
|
||||||
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github' && inputs.beta == true
|
||||||
|
run: |
|
||||||
|
make build-and-publish
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
CSC_LINK: "/tmp/codesign.p12"
|
||||||
|
CSC_KEY_PASSWORD: ${{ secrets.CODE_SIGN_P12_PASSWORD }}
|
||||||
|
CSC_IDENTITY_AUTO_DISCOVERY: "true"
|
||||||
|
APPLE_ID: ${{ secrets.APPLE_ID }}
|
||||||
|
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
|
||||||
|
APP_PATH: "."
|
||||||
|
DEVELOPER_ID: ${{ secrets.DEVELOPER_ID }}
|
||||||
|
AWS_ACCESS_KEY_ID: ${{ secrets.DELTA_AWS_ACCESS_KEY_ID }}
|
||||||
|
AWS_SECRET_ACCESS_KEY: ${{ secrets.DELTA_AWS_SECRET_ACCESS_KEY }}
|
||||||
|
AWS_DEFAULT_REGION: auto
|
||||||
|
AWS_EC2_METADATA_DISABLED: "true"
|
||||||
|
AWS_MAX_ATTEMPTS: "5"
|
||||||
|
|
||||||
- name: Upload Artifact
|
- name: Upload Artifact
|
||||||
if: inputs.public_provider != 'github'
|
if: inputs.public_provider != 'github'
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
@ -154,7 +189,15 @@ jobs:
|
|||||||
path: ./electron/dist/jan-mac-arm64-${{ inputs.new_version }}.dmg
|
path: ./electron/dist/jan-mac-arm64-${{ inputs.new_version }}.dmg
|
||||||
|
|
||||||
- name: Upload Artifact
|
- name: Upload Artifact
|
||||||
|
if: inputs.beta == false
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: latest-mac-arm64
|
name: latest-mac-arm64
|
||||||
path: ./electron/dist/latest-mac.yml
|
path: ./electron/dist/latest-mac.yml
|
||||||
|
|
||||||
|
- name: Upload Artifact
|
||||||
|
if: inputs.beta == true
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: beta-mac-arm64
|
||||||
|
path: ./electron/dist/beta-mac.yml
|
||||||
57
.github/workflows/template-build-macos-x64.yml
vendored
57
.github/workflows/template-build-macos-x64.yml
vendored
@ -19,6 +19,10 @@ on:
|
|||||||
required: false
|
required: false
|
||||||
type: string
|
type: string
|
||||||
default: '/latest/'
|
default: '/latest/'
|
||||||
|
beta:
|
||||||
|
required: false
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
secrets:
|
secrets:
|
||||||
DELTA_AWS_S3_BUCKET_NAME:
|
DELTA_AWS_S3_BUCKET_NAME:
|
||||||
required: false
|
required: false
|
||||||
@ -68,7 +72,7 @@ jobs:
|
|||||||
jq --arg version "${{ inputs.new_version }}" '.version = $version' web/package.json > /tmp/package.json
|
jq --arg version "${{ inputs.new_version }}" '.version = $version' web/package.json > /tmp/package.json
|
||||||
mv /tmp/package.json web/package.json
|
mv /tmp/package.json web/package.json
|
||||||
|
|
||||||
jq '.build.publish = [{"provider": "generic", "url": "${{ secrets.CLOUDFLARE_R2_PUBLIC_URL }}", "channel": "latest"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "${{ inputs.aws_s3_prefix }}", "channel": "latest"}]' electron/package.json > /tmp/package.json
|
jq '.build.publish = [{"provider": "generic", "url": "${{ secrets.CLOUDFLARE_R2_PUBLIC_URL }}", "channel": "latest"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "temp-latest", "channel": "latest"}]' electron/package.json > /tmp/package.json
|
||||||
mv /tmp/package.json electron/package.json
|
mv /tmp/package.json electron/package.json
|
||||||
|
|
||||||
jq --arg teamid "${{ secrets.APPLE_TEAM_ID }}" '.build.mac.notarize.teamId = $teamid' electron/package.json > /tmp/package.json
|
jq --arg teamid "${{ secrets.APPLE_TEAM_ID }}" '.build.mac.notarize.teamId = $teamid' electron/package.json > /tmp/package.json
|
||||||
@ -76,13 +80,25 @@ jobs:
|
|||||||
|
|
||||||
cat electron/package.json
|
cat electron/package.json
|
||||||
|
|
||||||
|
- name: Change App Name for beta version
|
||||||
|
if: inputs.beta == true
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
chmod +x .github/scripts/rename-app-beta.sh
|
||||||
|
.github/scripts/rename-app-beta.sh ./electron/package.json
|
||||||
|
chmod +x .github/scripts/rename-workspace-beta.sh
|
||||||
|
.github/scripts/rename-workspace-beta.sh ./package.json
|
||||||
|
echo "------------------------"
|
||||||
|
cat ./electron/package.json
|
||||||
|
echo "------------------------"
|
||||||
|
cat ./package.json
|
||||||
|
jq '.build.publish = [{"provider": "generic", "url": "https://delta.jan.ai/beta", "channel": "beta"}, {"provider": "github", "owner": "janhq", "repo": "jan", "channel": "beta"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "temp-beta", "channel": "beta"}]' electron/package.json > /tmp/package.json
|
||||||
|
mv /tmp/package.json electron/package.json
|
||||||
|
cat electron/package.json
|
||||||
|
|
||||||
- name: Update app version base on tag
|
- name: Update app version base on tag
|
||||||
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github'
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github'
|
||||||
run: |
|
run: |
|
||||||
if [[ ! "${VERSION_TAG}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
|
||||||
echo "Error: Tag is not valid!"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
jq --arg version "${VERSION_TAG#v}" '.version = $version' electron/package.json > /tmp/package.json
|
jq --arg version "${VERSION_TAG#v}" '.version = $version' electron/package.json > /tmp/package.json
|
||||||
mv /tmp/package.json electron/package.json
|
mv /tmp/package.json electron/package.json
|
||||||
jq --arg version "${VERSION_TAG#v}" '.version = $version' web/package.json > /tmp/package.json
|
jq --arg version "${VERSION_TAG#v}" '.version = $version' web/package.json > /tmp/package.json
|
||||||
@ -131,7 +147,7 @@ jobs:
|
|||||||
AWS_MAX_ATTEMPTS: "5"
|
AWS_MAX_ATTEMPTS: "5"
|
||||||
|
|
||||||
- name: Build and publish app to github
|
- name: Build and publish app to github
|
||||||
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github'
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github' && inputs.beta == false
|
||||||
run: |
|
run: |
|
||||||
make build-and-publish
|
make build-and-publish
|
||||||
env:
|
env:
|
||||||
@ -146,6 +162,25 @@ jobs:
|
|||||||
ANALYTICS_ID: ${{ secrets.JAN_APP_UMAMI_PROJECT_API_KEY }}
|
ANALYTICS_ID: ${{ secrets.JAN_APP_UMAMI_PROJECT_API_KEY }}
|
||||||
ANALYTICS_HOST: ${{ secrets.JAN_APP_UMAMI_URL }}
|
ANALYTICS_HOST: ${{ secrets.JAN_APP_UMAMI_URL }}
|
||||||
|
|
||||||
|
- name: Build and publish app to github
|
||||||
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github' && inputs.beta == true
|
||||||
|
run: |
|
||||||
|
make build-and-publish
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
CSC_LINK: "/tmp/codesign.p12"
|
||||||
|
CSC_KEY_PASSWORD: ${{ secrets.CODE_SIGN_P12_PASSWORD }}
|
||||||
|
CSC_IDENTITY_AUTO_DISCOVERY: "true"
|
||||||
|
APPLE_ID: ${{ secrets.APPLE_ID }}
|
||||||
|
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
|
||||||
|
APP_PATH: "."
|
||||||
|
DEVELOPER_ID: ${{ secrets.DEVELOPER_ID }}
|
||||||
|
AWS_ACCESS_KEY_ID: ${{ secrets.DELTA_AWS_ACCESS_KEY_ID }}
|
||||||
|
AWS_SECRET_ACCESS_KEY: ${{ secrets.DELTA_AWS_SECRET_ACCESS_KEY }}
|
||||||
|
AWS_DEFAULT_REGION: auto
|
||||||
|
AWS_EC2_METADATA_DISABLED: "true"
|
||||||
|
AWS_MAX_ATTEMPTS: "5"
|
||||||
|
|
||||||
- name: Upload Artifact
|
- name: Upload Artifact
|
||||||
if: inputs.public_provider != 'github'
|
if: inputs.public_provider != 'github'
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
@ -154,7 +189,15 @@ jobs:
|
|||||||
path: ./electron/dist/jan-mac-x64-${{ inputs.new_version }}.dmg
|
path: ./electron/dist/jan-mac-x64-${{ inputs.new_version }}.dmg
|
||||||
|
|
||||||
- name: Upload Artifact
|
- name: Upload Artifact
|
||||||
|
if: inputs.beta == false
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: latest-mac-x64
|
name: latest-mac-x64
|
||||||
path: ./electron/dist/latest-mac.yml
|
path: ./electron/dist/latest-mac.yml
|
||||||
|
|
||||||
|
- name: Upload Artifact
|
||||||
|
if: inputs.beta == true
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: beta-mac-x64
|
||||||
|
path: ./electron/dist/beta-mac.yml
|
||||||
50
.github/workflows/template-build-windows-x64.yml
vendored
50
.github/workflows/template-build-windows-x64.yml
vendored
@ -19,6 +19,10 @@ on:
|
|||||||
required: false
|
required: false
|
||||||
type: string
|
type: string
|
||||||
default: '/latest/'
|
default: '/latest/'
|
||||||
|
beta:
|
||||||
|
required: false
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
secrets:
|
secrets:
|
||||||
DELTA_AWS_S3_BUCKET_NAME:
|
DELTA_AWS_S3_BUCKET_NAME:
|
||||||
required: false
|
required: false
|
||||||
@ -69,21 +73,37 @@ jobs:
|
|||||||
jq --arg version "${{ inputs.new_version }}" '.version = $version' web/package.json > /tmp/package.json
|
jq --arg version "${{ inputs.new_version }}" '.version = $version' web/package.json > /tmp/package.json
|
||||||
mv /tmp/package.json web/package.json
|
mv /tmp/package.json web/package.json
|
||||||
|
|
||||||
jq '.build.publish = [{"provider": "generic", "url": "${{ secrets.CLOUDFLARE_R2_PUBLIC_URL }}", "channel": "latest"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "${{ inputs.aws_s3_prefix }}", "channel": "latest"}]' electron/package.json > /tmp/package.json
|
jq '.build.publish = [{"provider": "generic", "url": "${{ secrets.CLOUDFLARE_R2_PUBLIC_URL }}", "channel": "latest"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "temp-latest", "channel": "latest"}]' electron/package.json > /tmp/package.json
|
||||||
mv /tmp/package.json electron/package.json
|
mv /tmp/package.json electron/package.json
|
||||||
|
|
||||||
jq '.build.win.sign = "./sign.js"' electron/package.json > /tmp/package.json
|
jq '.build.win.sign = "./sign.js"' electron/package.json > /tmp/package.json
|
||||||
mv /tmp/package.json electron/package.json
|
mv /tmp/package.json electron/package.json
|
||||||
cat electron/package.json
|
cat electron/package.json
|
||||||
|
|
||||||
|
- name: Change App Name for beta version
|
||||||
|
if: inputs.beta == true
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
chmod +x .github/scripts/rename-app-beta.sh
|
||||||
|
.github/scripts/rename-app-beta.sh ./electron/package.json
|
||||||
|
chmod +x .github/scripts/rename-workspace-beta.sh
|
||||||
|
.github/scripts/rename-workspace-beta.sh ./package.json
|
||||||
|
chmod +x .github/scripts/rename-uninstaller-beta.sh
|
||||||
|
.github/scripts/rename-uninstaller-beta.sh
|
||||||
|
echo "------------------------"
|
||||||
|
cat ./electron/package.json
|
||||||
|
echo "------------------------"
|
||||||
|
cat ./package.json
|
||||||
|
echo "------------------------"
|
||||||
|
cat ./electron/scripts/uninstaller.nsh
|
||||||
|
jq '.build.publish = [{"provider": "generic", "url": "https://delta.jan.ai/beta", "channel": "beta"}, {"provider": "github", "owner": "janhq", "repo": "jan", "channel": "beta"}, {"provider": "s3", "acl": null, "bucket": "${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}", "region": "${{ secrets.DELTA_AWS_REGION}}", "path": "temp-beta", "channel": "beta"}]' electron/package.json > /tmp/package.json
|
||||||
|
mv /tmp/package.json electron/package.json
|
||||||
|
cat electron/package.json
|
||||||
|
|
||||||
- name: Update app version base on tag
|
- name: Update app version base on tag
|
||||||
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github'
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
if [[ ! "${VERSION_TAG}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
|
||||||
echo "Error: Tag is not valid!"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
jq --arg version "${VERSION_TAG#v}" '.version = $version' electron/package.json > /tmp/package.json
|
jq --arg version "${VERSION_TAG#v}" '.version = $version' electron/package.json > /tmp/package.json
|
||||||
mv /tmp/package.json electron/package.json
|
mv /tmp/package.json electron/package.json
|
||||||
jq --arg version "${VERSION_TAG#v}" '.version = $version' web/package.json > /tmp/package.json
|
jq --arg version "${VERSION_TAG#v}" '.version = $version' web/package.json > /tmp/package.json
|
||||||
@ -121,7 +141,7 @@ jobs:
|
|||||||
AWS_MAX_ATTEMPTS: "5"
|
AWS_MAX_ATTEMPTS: "5"
|
||||||
|
|
||||||
- name: Build app and publish app to github
|
- name: Build app and publish app to github
|
||||||
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github'
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github' && inputs.beta == false
|
||||||
run: |
|
run: |
|
||||||
make build-and-publish
|
make build-and-publish
|
||||||
env:
|
env:
|
||||||
@ -134,6 +154,24 @@ jobs:
|
|||||||
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
|
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
|
||||||
AZURE_CERT_NAME: homebrewltd
|
AZURE_CERT_NAME: homebrewltd
|
||||||
|
|
||||||
|
- name: Build app and publish app to github
|
||||||
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') && inputs.public_provider == 'github' && inputs.beta == true
|
||||||
|
run: |
|
||||||
|
make build-and-publish
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
AWS_ACCESS_KEY_ID: ${{ secrets.DELTA_AWS_ACCESS_KEY_ID }}
|
||||||
|
AWS_SECRET_ACCESS_KEY: ${{ secrets.DELTA_AWS_SECRET_ACCESS_KEY }}
|
||||||
|
AWS_DEFAULT_REGION: auto
|
||||||
|
AWS_EC2_METADATA_DISABLED: "true"
|
||||||
|
AWS_MAX_ATTEMPTS: "5"
|
||||||
|
AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }}
|
||||||
|
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
|
||||||
|
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
|
||||||
|
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
|
||||||
|
# AZURE_CERT_NAME: ${{ secrets.AZURE_CERT_NAME }}
|
||||||
|
AZURE_CERT_NAME: homebrewltd
|
||||||
|
|
||||||
- name: Upload Artifact
|
- name: Upload Artifact
|
||||||
if: inputs.public_provider != 'github'
|
if: inputs.public_provider != 'github'
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user