Merge branch 'main' into next
Some checks are pending
Build docker image / build-and-push (push) Waiting to run
Build pro image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase frontEnd test / frontend-test (18) (push) Waiting to run

This commit is contained in:
nocobase[bot] 2024-10-21 12:47:37 +00:00
commit cd7abe02f8

View File

@ -34,11 +34,19 @@ jobs:
run: echo "user-id=$(gh api "/users/${{ steps.app-token.outputs.app-slug }}[bot]" --jq .id)" >> "$GITHUB_OUTPUT"
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
- name: Get branch
id: get-branch
run: |
if [[ "${{ inputs.version }}" == "alpha" ]]; then
echo "branch=$(echo 'next')" >> $GITHUB_OUTPUT
else
echo "branch=$(echo 'main')" >> $GITHUB_OUTPUT
fi
- name: Checkout
uses: actions/checkout@v4
with:
repository: nocobase/nocobase
ref: ${{ github.head_ref || github.ref_name }}
ref: ${{ steps.get-branch.outputs.branch }}
token: ${{ steps.app-token.outputs.token }}
persist-credentials: true
fetch-depth: 0
@ -47,7 +55,7 @@ jobs:
with:
repository: nocobase/pro-plugins
path: packages/pro-plugins
ref: ${{ github.head_ref || github.ref_name }}
ref: ${{ steps.get-branch.outputs.branch }}
fetch-depth: 0
token: ${{ steps.app-token.outputs.token }}
persist-credentials: true
@ -56,7 +64,7 @@ jobs:
run: |
for repo in ${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ' ') }}
do
git clone -b ${{ github.head_ref || github.ref_name }} https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/nocobase/$repo.git packages/pro-plugins/@nocobase/$repo
git clone -b ${{ steps.get-branch.outputs.branch }} https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/nocobase/$repo.git packages/pro-plugins/@nocobase/$repo
done
- name: Set user
run: |