diff --git a/.github/workflows/manual-build-auth-wecom-image.yml b/.github/workflows/manual-build-wecom-approval-image.yml similarity index 76% rename from .github/workflows/manual-build-auth-wecom-image.yml rename to .github/workflows/manual-build-wecom-approval-image.yml index 41acc88fb1..c7577c3d7d 100644 --- a/.github/workflows/manual-build-auth-wecom-image.yml +++ b/.github/workflows/manual-build-wecom-approval-image.yml @@ -1,4 +1,4 @@ -name: Build Auth WeCom Plugin Docker Image +name: Build WeCom Approval Notification concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -27,48 +27,48 @@ jobs: - name: Checkout nocobase/nocobase uses: actions/checkout@v4 with: - ref: ${{ github.head_ref || github.ref_name }} + ref: next fetch-depth: 0 - - name: Checkout nocobase/nocobase pr - shell: bash - run: | - gh pr checkout 5244 - env: - GITHUB_TOKEN: ${{ steps.app-token.outputs.token }} - - name: Checkout auth wecom plugin + # - name: Checkout nocobase/nocobase pr + # shell: bash + # run: | + # gh pr checkout 5244 + # env: + # GITHUB_TOKEN: ${{ steps.app-token.outputs.token }} + - name: Checkout wecom notification plugin uses: actions/checkout@v3 with: ref: main token: ${{ steps.app-token.outputs.token }} - repository: nocobase/plugin-auth-wecom - path: packages/pro-plugins/@nocobase/plugin-auth-wecom - - name: Checkout auth wecom pr + repository: nocobase/plugin-notification-wecom + path: packages/pro-plugins/@nocobase/plugin-notification-wecom + - name: Checkout wecom notification pr shell: bash run: | - cd ./packages/pro-plugins/@nocobase/plugin-auth-wecom + cd ./packages/pro-plugins/@nocobase/plugin-notification-wecom gh pr checkout 1 cd ../../../../ env: GITHUB_TOKEN: ${{ steps.app-token.outputs.token }} - - name: Checkout departments plugin + - name: Checkout workflow approval plugin uses: actions/checkout@v3 with: ref: main token: ${{ steps.app-token.outputs.token }} - repository: nocobase/plugin-departments - path: packages/pro-plugins/@nocobase/plugin-departments + repository: nocobase/plugin-workflow-approval + path: packages/pro-plugins/@nocobase/plugin-workflow-approval - name: Checkout pr shell: bash run: | - cd ./packages/pro-plugins/@nocobase/plugin-departments - gh pr checkout 4 + cd ./packages/pro-plugins/@nocobase/plugin-workflow-approval + gh pr checkout 6 cd ../../../../ env: GITHUB_TOKEN: ${{ steps.app-token.outputs.token }} - name: rm .git run: | - rm -rf packages/pro-plugins/@nocobase/plugin-auth-wecom/.git - rm -rf packages/pro-plugins/@nocobase/plugin-departments/.git + rm -rf packages/pro-plugins/@nocobase/plugin-wecom-notification/.git + rm -rf packages/pro-plugins/@nocobase/plugin-workflow-approval/.git git config --global user.email "you@example.com" && git config --global user.name "Your Name" && git add -A && git commit -m "tmp commit" - name: Set up QEMU uses: docker/setup-qemu-action@v2 @@ -85,7 +85,7 @@ jobs: - name: Set tags id: set-tags run: | - echo "::set-output name=tags::${{ secrets.ALI_DOCKER_REGISTRY }}/nocobase/nocobase:pr-1-auth-wecom" + echo "::set-output name=tags::${{ secrets.ALI_DOCKER_REGISTRY }}/nocobase/nocobase:pr-6-workflow-approval" - name: IMAGE_TAG env: IMAGE_TAG: pr-1 @@ -118,10 +118,10 @@ jobs: tags: ${{ steps.set-tags.outputs.tags }} - name: Deploy NocoBase env: - IMAGE_TAG: pr-1 + IMAGE_TAG: pr-6 run: | echo $IMAGE_TAG - export APP_NAME=$(echo $IMAGE_TAG | cut -d ":" -f 2)-auth-wecom + export APP_NAME=$(echo $IMAGE_TAG | cut -d ":" -f 2)-workflow-approval echo $APP_NAME curl --retry 2 --location --request POST "${{secrets.NOCOBASE_DEPLOY_HOST}}$APP_NAME" \ --header 'Content-Type: application/json' \