Merge remote-tracking branch 'origin/develop' into fb-dia-1802

HumanSignal · Jan 29, 2025 · 465adc9 · 465adc9
2 parents a349ae6 + 751d474
commit 465adc9
Show file tree

Hide file tree

Showing 274 changed files with 3,839 additions and 1,693 deletions.
diff --git a/.github/workflows/build_pypi.yml b/.github/workflows/build_pypi.yml
@@ -79,7 +79,7 @@ jobs:
         run: |
           set -euo pipefail
           version=$(sed "s/^v//g" <<< ${PROVIDED_VERSION})
-          ./toml set '${{ env.PYTHON_VERSION_FILE }}' tool.poetry.version "$version" > pyproject.toml.new
+          ./toml set '${{ env.PYTHON_VERSION_FILE }}' project.version "$version" > pyproject.toml.new
           mv -f pyproject.toml.new pyproject.toml
 
       - name: Setup frontend environment
@@ -98,7 +98,9 @@ jobs:
         run: yarn version:libs
 
       - name: "Install poetry"
-        run: pipx install poetry
+        env:
+          POETRY_VERSION: ${{ vars.POETRY_VERSION }}
+        run: pipx install "poetry==${POETRY_VERSION}"
 
       - name: "Set up Python"
         id: setup_python

diff --git a/.github/workflows/docker-build-ontop.yml b/.github/workflows/docker-build-ontop.yml
@@ -110,7 +110,7 @@ jobs:
             ${{ steps.calculate-docker-tags.outputs.docker-tags }}
 
       - name: Push Docker image
-        uses: docker/build-push-action@v6.11.0
+        uses: docker/build-push-action@v6.13.0
         id: docker_build_and_push
         with:
           context: .

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -129,7 +129,7 @@ jobs:
             type=raw,value=${{ steps.version.outputs.build_version }}
 
       - name: Push Docker image
-        uses: docker/build-push-action@v6.11.0
+        uses: docker/build-push-action@v6.13.0
         id: docker_build_and_push
         with:
           context: .
@@ -143,8 +143,9 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           build-args: |
-            BRANCH_OVERRIDE: ${{ inputs.branch_name }}
-            VERSION_OVERRIDE: ${{ steps.version.outputs.build_version }}
+            BRANCH_OVERRIDE=${{ inputs.branch_name }}
+            VERSION_OVERRIDE=${{ steps.version.outputs.build_version }}
+            POETRY_VERSION=${{ vars.POETRY_VERSION }}
 
       - name: Create Docker image tag Check
         uses: actions/github-script@v7

diff --git a/.github/workflows/docker-release-promote.yml b/.github/workflows/docker-release-promote.yml
@@ -195,7 +195,7 @@ jobs:
             ${{ steps.generate-tags.outputs.ubuntu-tags }}
 
       - name: Build and Push Release Ubuntu Docker image
-        uses: docker/build-push-action@v6.11.0
+        uses: docker/build-push-action@v6.13.0
         id: docker_build
         with:
           context: ${{ steps.release_dockerfile.outputs.release_dir }}

diff --git a/.github/workflows/feature-flags-update.yml b/.github/workflows/feature-flags-update.yml
@@ -29,6 +29,16 @@ jobs:
     steps:
       - uses: hmarr/[email protected]
 
+      - name: Add Workflow link to chat ops command comment
+        if: github.event.client_payload.github.payload.comment.id && github.event.client_payload.github.payload.repository.full_name
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          token: ${{ secrets.GIT_PAT }}
+          repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
+          comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
+          body: |
+            > [Workflow run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
+
       - name: Configure git
         shell: bash
         run: |
@@ -68,3 +78,12 @@ jobs:
           git status -s
           git commit -m '${{ env.FEATURE_FLAGS_COMMIT_MESSAGE }}' -m 'Workflow run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}' || true
           git push origin HEAD
+
+      - name: Add reaction to chat ops command comment
+        if: always() && github.event.client_payload.github.payload.comment.id && github.event.client_payload.github.payload.repository.full_name
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          token: ${{ secrets.GIT_PAT }}
+          repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
+          comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
+          reactions: ${{ job.status == 'success' && '+1' || '-1' }}
diff --git a/.github/workflows/ff-command.yml b/.github/workflows/ff-command.yml
@@ -8,60 +8,14 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.client_payload.github.payload.issue.number }}-${{ github.event.client_payload.slash_command.command }}-${{ github.event.client_payload.slash_command.args.unnamed.arg1 || github.event.client_payload.slash_command.args.all }}
 
 jobs:
-
-  update-prepare:
-    name: "Update: Prepare"
-    if: github.event.client_payload.slash_command.args.unnamed.arg1 == 'update'
-    runs-on: ubuntu-latest
-    timeout-minutes: 1
-    steps:
-      - name: Update comment
-        uses: peter-evans/create-or-update-comment@v4
-        with:
-          token: ${{ secrets.GIT_PAT }}
-          repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
-          comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
-          body: |
-            > [Workflow run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
-
-  update-update-ff:
+  update-ff:
     name: "Update: Update Feature Flags"
     if: github.event.client_payload.slash_command.args.unnamed.arg1 == 'update'
-    needs:
-      - update-prepare
     uses: ./.github/workflows/feature-flags-update.yml
     with:
       ref: ${{ github.event.client_payload.pull_request.head.ref }}
     secrets: inherit
 
-  update-update-comment:
-    name: "Update: Update Comment"
-    if: always()
-    needs:
-      - update-update-ff
-    runs-on: ubuntu-latest
-    timeout-minutes: 1
-    steps:
-      - name: Get details
-        id: details
-        shell: bash
-        env:
-          PR_HEAD: ${{ github.event.client_payload.pull_request.head.ref }}
-        run: |
-          reaction='-1'
-          if [[ '${{ needs.update-update-ff.result }}' == 'success' ]]; then
-            reaction='+1'
-          fi
-          echo "reaction=${reaction}" >> $GITHUB_OUTPUT
-
-      - name: Update comment
-        uses: peter-evans/create-or-update-comment@v4
-        with:
-          token: ${{ secrets.GIT_PAT }}
-          repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
-          comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
-          reactions: ${{ steps.details.outputs.reaction }}
-
   help:
     if: ${{ github.event.client_payload.slash_command.args.unnamed.arg1 == 'help' || !contains(fromJson('["update"]'), github.event.client_payload.slash_command.args.unnamed.arg1) }}
     runs-on: ubuntu-latest

diff --git a/.github/workflows/fm-command.yml b/.github/workflows/fm-command.yml
@@ -0,0 +1,34 @@
+name: "/fm command"
+
+on:
+  repository_dispatch:
+    types: [ fm-command ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.client_payload.github.payload.issue.number }}-${{ github.event.client_payload.slash_command.command }}-${{ github.event.client_payload.slash_command.args.unnamed.arg1 || github.event.client_payload.slash_command.args.all }}
+
+jobs:
+  sync:
+    name: "Update: Update Feature Flags"
+    if: github.event.client_payload.slash_command.args.unnamed.arg1 == 'sync'
+    uses: ./.github/workflows/follow-merge-upstream-repo-sync-v2.yml
+    with:
+      branch_name: ${{ github.event.client_payload.pull_request.head.ref }}
+    secrets: inherit
+
+  help:
+    if: ${{ github.event.client_payload.slash_command.args.unnamed.arg1 == 'help' || !contains(fromJson('["sync"]'), github.event.client_payload.slash_command.args.unnamed.arg1) }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 1
+    steps:
+      - name: Update comment
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          token: ${{ secrets.GIT_PAT }}
+          repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
+          comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
+          body: |
+            > Command | Description
+            > --- | ---
+            > /fm sync | Sync upstream prs and merge with pull request base
+          reaction-type: hooray
diff --git a/.github/workflows/follow-merge-sync-pr.yml b/.github/workflows/follow-merge-sync-pr.yml
@@ -65,15 +65,20 @@ jobs:
             });
             throw `${{ github.actor }} don't have membership in ${owner} organization`
 
-      - name: Checkout Actions Hub
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GIT_PAT }}
-          repository: HumanSignal/actions-hub
-          path: ./.github/actions-hub
-
-      - name: Dispatch Follow Merge Event
-        uses: ./.github/actions-hub/actions/follow-merge-dispatch
+      - name: Dispatch Follow Merge Workflow
+        uses: actions/github-script@v7
+        env:
+          BRANCH_NAME: ${{ github.head_ref }}
         with:
-          github_token: ${{ secrets.GIT_PAT }}
-          downstream_repository: "${{ env.DOWNSTREAM_REPOSITORY }}"
+          github-token: ${{ secrets.GIT_PAT }}
+          script: |
+            const branch_name = process.env.BRANCH_NAME;
+            github.rest.actions.createWorkflowDispatch({
+              owner: "HumanSignal",
+              repo: "label-studio-enterprise",
+              workflow_id: "follow-merge-upstream-repo-sync-v2.yml",
+              ref: "develop",
+              inputs: {
+                branch_name: branch_name,
+              }
+            });