Merge remote-tracking branch 'origin/develop' into feat/per-app-builder-fe

This commit is contained in:
Peter Clement 2023-08-29 08:56:25 +01:00
commit 34a125f90d
3 changed files with 21 additions and 2 deletions

View File

@ -0,0 +1,19 @@
name: deploy-featurebranch
on:
pull_request:
branches:
- develop
jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: passeidireto/trigger-external-workflow-action@main
env:
BRANCH: ${{ github.head_ref }}
with:
repository: budibase/budibase-deploys
event: featurebranch-qa-deploy
github_pat: ${{ secrets.GH_ACCESS_TOKEN }}

View File

@ -1,5 +1,5 @@
{
"version": "2.9.30-alpha.13",
"version": "2.9.33-alpha.0",
"npmClient": "yarn",
"packages": [
"packages/*"

View File

@ -215,7 +215,7 @@
const nameA = getDisplayName(a)
const nameB = getDisplayName(b)
if (orderA !== orderB) {
return orderA < orderB ? orderA : orderB
return orderA < orderB ? a : b
}
return nameA < nameB ? a : b
})